From 34856fa09ba83db53097acebf6e9bde54121c27f Mon Sep 17 00:00:00 2001 From: Egor Koleda Date: Tue, 12 Sep 2023 06:10:17 +0300 Subject: [PATCH] fix imports --- .../java/by/radioegor146/ClassMethodFilter.java | 2 -- .../main/java/by/radioegor146/ClassMethodList.java | 2 -- obfuscator/src/main/java/by/radioegor146/Util.java | 1 - .../instructions/GenericInstructionHandler.java | 2 -- .../by/radioegor146/instructions/InsnHandler.java | 1 - .../by/radioegor146/instructions/LabelHandler.java | 1 - .../by/radioegor146/source/ClassSourceBuilder.java | 1 - .../special/ClInitSpecialMethodProcessor.java | 2 -- .../test/java/by/radioegor146/TestsGenerator.java | 14 +++++--------- 9 files changed, 5 insertions(+), 21 deletions(-) diff --git a/obfuscator/src/main/java/by/radioegor146/ClassMethodFilter.java b/obfuscator/src/main/java/by/radioegor146/ClassMethodFilter.java index 09ef226..b9b4aa6 100644 --- a/obfuscator/src/main/java/by/radioegor146/ClassMethodFilter.java +++ b/obfuscator/src/main/java/by/radioegor146/ClassMethodFilter.java @@ -6,8 +6,6 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; -import java.util.List; - public class ClassMethodFilter { private static final String NATIVE_ANNOTATION_DESC = Type.getDescriptor(Native.class); diff --git a/obfuscator/src/main/java/by/radioegor146/ClassMethodList.java b/obfuscator/src/main/java/by/radioegor146/ClassMethodList.java index 3daea50..22f458a 100644 --- a/obfuscator/src/main/java/by/radioegor146/ClassMethodList.java +++ b/obfuscator/src/main/java/by/radioegor146/ClassMethodList.java @@ -1,7 +1,5 @@ package by.radioegor146; -import jdk.nashorn.internal.runtime.regexp.joni.Regex; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/obfuscator/src/main/java/by/radioegor146/Util.java b/obfuscator/src/main/java/by/radioegor146/Util.java index af5a026..7046809 100644 --- a/obfuscator/src/main/java/by/radioegor146/Util.java +++ b/obfuscator/src/main/java/by/radioegor146/Util.java @@ -1,7 +1,6 @@ package by.radioegor146; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; import java.io.*; import java.lang.reflect.Field; diff --git a/obfuscator/src/main/java/by/radioegor146/instructions/GenericInstructionHandler.java b/obfuscator/src/main/java/by/radioegor146/instructions/GenericInstructionHandler.java index 96bcd3e..8728b40 100644 --- a/obfuscator/src/main/java/by/radioegor146/instructions/GenericInstructionHandler.java +++ b/obfuscator/src/main/java/by/radioegor146/instructions/GenericInstructionHandler.java @@ -7,8 +7,6 @@ import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.TryCatchBlockNode; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; import java.util.*; import java.util.stream.Collectors; diff --git a/obfuscator/src/main/java/by/radioegor146/instructions/InsnHandler.java b/obfuscator/src/main/java/by/radioegor146/instructions/InsnHandler.java index 1a1834b..f4bb951 100644 --- a/obfuscator/src/main/java/by/radioegor146/instructions/InsnHandler.java +++ b/obfuscator/src/main/java/by/radioegor146/instructions/InsnHandler.java @@ -2,7 +2,6 @@ import by.radioegor146.MethodContext; import by.radioegor146.Util; -import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.InsnNode; diff --git a/obfuscator/src/main/java/by/radioegor146/instructions/LabelHandler.java b/obfuscator/src/main/java/by/radioegor146/instructions/LabelHandler.java index f55e60a..f384c0f 100644 --- a/obfuscator/src/main/java/by/radioegor146/instructions/LabelHandler.java +++ b/obfuscator/src/main/java/by/radioegor146/instructions/LabelHandler.java @@ -1,7 +1,6 @@ package by.radioegor146.instructions; import by.radioegor146.MethodContext; -import by.radioegor146.Util; import org.objectweb.asm.tree.LabelNode; public class LabelHandler extends GenericInstructionHandler { diff --git a/obfuscator/src/main/java/by/radioegor146/source/ClassSourceBuilder.java b/obfuscator/src/main/java/by/radioegor146/source/ClassSourceBuilder.java index da313d4..3855ba8 100644 --- a/obfuscator/src/main/java/by/radioegor146/source/ClassSourceBuilder.java +++ b/obfuscator/src/main/java/by/radioegor146/source/ClassSourceBuilder.java @@ -1,7 +1,6 @@ package by.radioegor146.source; import by.radioegor146.HiddenCppMethod; -import by.radioegor146.HiddenMethodsPool; import by.radioegor146.NodeCache; import by.radioegor146.Util; import org.objectweb.asm.tree.ClassNode; diff --git a/obfuscator/src/main/java/by/radioegor146/special/ClInitSpecialMethodProcessor.java b/obfuscator/src/main/java/by/radioegor146/special/ClInitSpecialMethodProcessor.java index e18411c..380bca5 100644 --- a/obfuscator/src/main/java/by/radioegor146/special/ClInitSpecialMethodProcessor.java +++ b/obfuscator/src/main/java/by/radioegor146/special/ClInitSpecialMethodProcessor.java @@ -6,8 +6,6 @@ import org.objectweb.asm.tree.*; import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; public class ClInitSpecialMethodProcessor implements SpecialMethodProcessor { diff --git a/obfuscator/src/test/java/by/radioegor146/TestsGenerator.java b/obfuscator/src/test/java/by/radioegor146/TestsGenerator.java index 8584218..d1230f8 100644 --- a/obfuscator/src/test/java/by/radioegor146/TestsGenerator.java +++ b/obfuscator/src/test/java/by/radioegor146/TestsGenerator.java @@ -16,10 +16,10 @@ public class TestsGenerator { - private final static List ALLOWED_TESTS = null; - /* private final static List ALLOWED_TESTS = Arrays.asList( - "InterfaceDefaultStacktrace" - ); */ + private final static List ALLOWED_TESTS = null; /* + private final static List ALLOWED_TESTS = Arrays.asList( + "StringTokenizer" + ); // */ private static boolean testAllowed(Path testPath) { //noinspection ConstantValue @@ -44,11 +44,7 @@ public Stream generateTests() throws URISyntaxException, IOExceptio Objects.requireNonNull(tests, "No tests dir in resources"); Path testDir = Paths.get(tests.toURI()); - return Files.walk(testDir, FileVisitOption.FOLLOW_LINKS) - .filter(Files::isDirectory) - .filter(TestsGenerator::hasJavaFiles) - .filter(TestsGenerator::testAllowed) - .map(p -> DynamicTest.dynamicTest(testDir.relativize(p).toString(), new ClassicTest(p, testDir.relativize(p).toString()))); + return Files.walk(testDir, FileVisitOption.FOLLOW_LINKS).filter(Files::isDirectory).filter(TestsGenerator::hasJavaFiles).filter(TestsGenerator::testAllowed).map(p -> DynamicTest.dynamicTest(testDir.relativize(p).toString(), new ClassicTest(p, testDir.relativize(p).toString()))); } private static boolean hasJavaFiles(Path path) {