mirror of
https://github.com/skylot/jadx.git
synced 2024-10-07 10:03:27 +00:00
style: prefer use Stream.of method
This commit is contained in:
parent
404136cd72
commit
c05368d92e
@ -1,12 +1,12 @@
|
||||
package jadx.cli;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import com.beust.jcommander.IStringConverter;
|
||||
import com.beust.jcommander.Parameter;
|
||||
@ -353,7 +353,7 @@ public class JadxCLIArgs {
|
||||
}
|
||||
|
||||
public static String enumValuesString(Enum<?>[] values) {
|
||||
return Arrays.stream(values)
|
||||
return Stream.of(values)
|
||||
.map(v -> '\'' + v.name().toLowerCase(Locale.ROOT) + '\'')
|
||||
.collect(Collectors.joining(", "));
|
||||
}
|
||||
|
@ -13,12 +13,12 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Stream;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipInputStream;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
@ -88,7 +88,7 @@ public class ClsSet {
|
||||
}
|
||||
if (LOG.isDebugEnabled()) {
|
||||
long time = System.currentTimeMillis() - startTime;
|
||||
int methodsCount = Arrays.stream(classes).mapToInt(clspClass -> clspClass.getMethodsMap().size()).sum();
|
||||
int methodsCount = Stream.of(classes).mapToInt(clspClass -> clspClass.getMethodsMap().size()).sum();
|
||||
LOG.debug("Load class set in {}ms, classes: {}, methods: {}", time, classes.length, methodsCount);
|
||||
}
|
||||
}
|
||||
@ -246,7 +246,7 @@ public class ClsSet {
|
||||
writeMethod(out, method, names);
|
||||
}
|
||||
}
|
||||
int methodsCount = Arrays.stream(classes).mapToInt(c -> c.getMethodsMap().size()).sum();
|
||||
int methodsCount = Stream.of(classes).mapToInt(c -> c.getMethodsMap().size()).sum();
|
||||
LOG.info("Classes: {}, methods: {}, file size: {}B", classes.length, methodsCount, out.size());
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
package jadx.core.codegen;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashSet;
|
||||
@ -8,11 +9,11 @@ import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import com.android.dx.rop.code.AccessFlags;
|
||||
import com.google.common.collect.Streams;
|
||||
|
||||
import jadx.api.ICodeInfo;
|
||||
import jadx.api.JadxArgs;
|
||||
@ -252,7 +253,8 @@ public class ClassGen {
|
||||
}
|
||||
|
||||
private void addInnerClsAndMethods(CodeWriter clsCode) {
|
||||
Streams.concat(cls.getInnerClasses().stream(), cls.getMethods().stream())
|
||||
Stream.of(cls.getInnerClasses(), cls.getMethods())
|
||||
.flatMap(Collection::stream)
|
||||
.filter(node -> !node.contains(AFlag.DONT_GENERATE))
|
||||
.sorted(Comparator.comparingInt(LineAttrNode::getSourceLine))
|
||||
.forEach(node -> {
|
||||
|
@ -1,15 +1,15 @@
|
||||
package jadx.core.dex.visitors;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import com.google.common.collect.Streams;
|
||||
|
||||
import jadx.core.dex.attributes.AFlag;
|
||||
import jadx.core.dex.attributes.AType;
|
||||
import jadx.core.dex.attributes.nodes.DeclareVariablesAttr;
|
||||
@ -266,11 +266,8 @@ public class PrepareForCodeGen extends AbstractVisitor {
|
||||
for (ClassNode innerClass : cls.getInnerClasses()) {
|
||||
setClassSourceLine(innerClass);
|
||||
}
|
||||
|
||||
int minLine = Streams.concat(
|
||||
cls.getMethods().stream(),
|
||||
cls.getInnerClasses().stream(),
|
||||
cls.getFields().stream())
|
||||
int minLine = Stream.of(cls.getMethods(), cls.getInnerClasses(), cls.getFields())
|
||||
.flatMap(Collection::stream)
|
||||
.filter(mth -> !mth.contains(AFlag.DONT_GENERATE))
|
||||
.filter(mth -> mth.getSourceLine() != 0)
|
||||
.mapToInt(LineAttrNode::getSourceLine)
|
||||
|
@ -1,13 +1,13 @@
|
||||
package jadx.core.utils;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Arrays;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.jetbrains.annotations.TestOnly;
|
||||
import org.slf4j.Logger;
|
||||
@ -128,7 +128,7 @@ public class DebugUtils {
|
||||
ig.makeInsn(insn, code);
|
||||
String codeStr = code.finish().getCodeStr();
|
||||
|
||||
List<String> insnStrings = Arrays.stream(codeStr.split(NL))
|
||||
List<String> insnStrings = Stream.of(codeStr.split(NL))
|
||||
.filter(StringUtils::notBlank)
|
||||
.map(s -> "|> " + s)
|
||||
.collect(Collectors.toList());
|
||||
@ -150,7 +150,7 @@ public class DebugUtils {
|
||||
|
||||
private static void printWithAttributes(CodeWriter cw, String indent, String codeStr, IAttributeNode attrNode) {
|
||||
String str = attrNode.isAttrStorageEmpty() ? codeStr : codeStr + ' ' + attrNode.getAttributesString();
|
||||
List<String> attrStrings = Arrays.stream(str.split(NL))
|
||||
List<String> attrStrings = Stream.of(str.split(NL))
|
||||
.filter(StringUtils::notBlank)
|
||||
.collect(Collectors.toList());
|
||||
Iterator<String> it = attrStrings.iterator();
|
||||
|
@ -1,10 +1,10 @@
|
||||
package jadx.tests.api;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jf.smali.Smali;
|
||||
@ -86,7 +86,7 @@ public abstract class SmaliTest extends IntegrationTest {
|
||||
File smaliDir = new File(SMALI_TESTS_DIR, smaliFilesDir);
|
||||
String[] smaliFileNames = smaliDir.list((dir, name) -> name.endsWith(".smali"));
|
||||
assertThat("Smali files not found in " + smaliDir, smaliFileNames, notNullValue());
|
||||
return Arrays.stream(smaliFileNames)
|
||||
return Stream.of(smaliFileNames)
|
||||
.map(file -> new File(smaliDir, file))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
package jadx.gui.utils.search;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@ -62,7 +62,7 @@ class StringRefTest {
|
||||
}
|
||||
|
||||
private static void checkSplit(String str, String splitBy, String... result) {
|
||||
List<StringRef> expectedStringRegList = Arrays.stream(result).map(StringRef::fromStr).collect(Collectors.toList());
|
||||
List<StringRef> expectedStringRegList = Stream.of(result).map(StringRef::fromStr).collect(Collectors.toList());
|
||||
assertThat(StringRef.split(str, splitBy), is(expectedStringRegList));
|
||||
|
||||
// compare with original split
|
||||
|
Loading…
Reference in New Issue
Block a user