From 677956bc84daecb0d43f496bf6755b6dce33d917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20V=C3=A1zquez?= Date: Mon, 2 Aug 2021 13:36:01 +0200 Subject: [PATCH] Remove unused imports --- .../deobfuscator/DeobfuscatorMain.java | 14 -------------- .../deobfuscator/analyzer/frame/JumpFrame.java | 3 +-- .../deobfuscator/analyzer/frame/MathFrame.java | 1 - .../deobfuscator/analyzer/frame/PopFrame.java | 1 - .../executor/defined/DictionaryMethodProvider.java | 1 - .../deobfuscator/graph/GraphHelper.java | 3 --- .../iterablematcher/ConstantIntInsnStep.java | 2 -- .../iterablematcher/FieldInsnStep.java | 2 -- .../deobfuscator/iterablematcher/TypeInsnStep.java | 3 --- .../rules/classguard/RuleEncryptedClass.java | 1 - .../general/peephole/TrapHandlerMerger.java | 2 -- .../v9/utils/MethodParameterChangeClassFinder.java | 1 - .../deobfuscator/utils/ClassTree.java | 2 -- .../deobfuscator/utils/InstructionModifier.java | 2 +- 14 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/DeobfuscatorMain.java b/src/main/java/com/javadeobfuscator/deobfuscator/DeobfuscatorMain.java index b59b079b..dcaff2c1 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/DeobfuscatorMain.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/DeobfuscatorMain.java @@ -16,13 +16,6 @@ package com.javadeobfuscator.deobfuscator; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; @@ -31,19 +24,12 @@ import com.javadeobfuscator.deobfuscator.config.TransformerConfigDeserializer; import com.javadeobfuscator.deobfuscator.exceptions.NoClassInPathException; import com.javadeobfuscator.deobfuscator.exceptions.PreventableStackOverflowError; -import com.javadeobfuscator.deobfuscator.transformers.DelegatingTransformer; -import com.javadeobfuscator.deobfuscator.transformers.Transformer; import org.apache.commons.cli.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; public class DeobfuscatorMain { public static void main(String[] args) throws ClassNotFoundException { diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/JumpFrame.java b/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/JumpFrame.java index f9061d78..78b50512 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/JumpFrame.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/JumpFrame.java @@ -17,7 +17,6 @@ package com.javadeobfuscator.deobfuscator.analyzer.frame; import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.LabelNode; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +24,7 @@ public class JumpFrame extends Frame { private List comparators = new ArrayList<>(); - private transient List targets; + private transient List targets; public JumpFrame(int opcode, List comparators, AbstractInsnNode... targets) { super(opcode); diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/MathFrame.java b/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/MathFrame.java index e0a60044..58a6e400 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/MathFrame.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/MathFrame.java @@ -1,7 +1,6 @@ package com.javadeobfuscator.deobfuscator.analyzer.frame; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/PopFrame.java b/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/PopFrame.java index 2725727a..cbbcc67a 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/PopFrame.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/analyzer/frame/PopFrame.java @@ -1,6 +1,5 @@ package com.javadeobfuscator.deobfuscator.analyzer.frame; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/executor/defined/DictionaryMethodProvider.java b/src/main/java/com/javadeobfuscator/deobfuscator/executor/defined/DictionaryMethodProvider.java index 31601ad2..2c29c9a4 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/executor/defined/DictionaryMethodProvider.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/executor/defined/DictionaryMethodProvider.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; -import com.javadeobfuscator.deobfuscator.asm.ConstantPool; import com.javadeobfuscator.deobfuscator.executor.MethodExecutor; import com.javadeobfuscator.deobfuscator.executor.Context; import com.javadeobfuscator.deobfuscator.executor.providers.MethodProvider; diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/graph/GraphHelper.java b/src/main/java/com/javadeobfuscator/deobfuscator/graph/GraphHelper.java index b6f504f2..0fbda1b8 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/graph/GraphHelper.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/graph/GraphHelper.java @@ -17,12 +17,9 @@ package com.javadeobfuscator.deobfuscator.graph; import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodNode; - import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Objects; public class GraphHelper { public static Map validateUniqueClasses(Collection nodes) { diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/ConstantIntInsnStep.java b/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/ConstantIntInsnStep.java index 07ffba75..03790ffd 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/ConstantIntInsnStep.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/ConstantIntInsnStep.java @@ -1,9 +1,7 @@ package com.javadeobfuscator.deobfuscator.iterablematcher; import com.javadeobfuscator.deobfuscator.utils.Utils; -import org.objectweb.asm.Type; import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.LdcInsnNode; public class ConstantIntInsnStep extends IterableStep { diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/FieldInsnStep.java b/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/FieldInsnStep.java index 430ce86b..3f939808 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/FieldInsnStep.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/FieldInsnStep.java @@ -4,8 +4,6 @@ import org.apache.commons.lang3.Validate; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.TypeInsnNode; public class FieldInsnStep extends IterableStep { diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/TypeInsnStep.java b/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/TypeInsnStep.java index 453b7ba4..40130f44 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/TypeInsnStep.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/iterablematcher/TypeInsnStep.java @@ -1,12 +1,9 @@ package com.javadeobfuscator.deobfuscator.iterablematcher; -import java.util.Objects; - import com.javadeobfuscator.deobfuscator.utils.Utils; import org.apache.commons.lang3.Validate; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.TypeInsnNode; -import org.objectweb.asm.tree.VarInsnNode; public class TypeInsnStep extends IterableStep { diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleEncryptedClass.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleEncryptedClass.java index 5bce1388..c80d7d26 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleEncryptedClass.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/rules/classguard/RuleEncryptedClass.java @@ -20,7 +20,6 @@ import com.javadeobfuscator.deobfuscator.rules.*; import com.javadeobfuscator.deobfuscator.transformers.*; import com.javadeobfuscator.deobfuscator.transformers.classguard.*; -import org.objectweb.asm.tree.*; import java.util.*; diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/TrapHandlerMerger.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/TrapHandlerMerger.java index 08c3b9d9..aba9ed67 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/TrapHandlerMerger.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/general/peephole/TrapHandlerMerger.java @@ -27,8 +27,6 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import static org.objectweb.asm.Opcodes.*; - public class TrapHandlerMerger extends Transformer { @Override diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/zelix/v9/utils/MethodParameterChangeClassFinder.java b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/zelix/v9/utils/MethodParameterChangeClassFinder.java index ce875621..740095d1 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/transformers/zelix/v9/utils/MethodParameterChangeClassFinder.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/transformers/zelix/v9/utils/MethodParameterChangeClassFinder.java @@ -16,7 +16,6 @@ package com.javadeobfuscator.deobfuscator.transformers.zelix.v9.utils; -import com.javadeobfuscator.deobfuscator.graph.inheritancegraph.InheritanceGraph; import com.javadeobfuscator.deobfuscator.transformers.ClassFinder; import com.javadeobfuscator.deobfuscator.utils.TransformerHelper; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/utils/ClassTree.java b/src/main/java/com/javadeobfuscator/deobfuscator/utils/ClassTree.java index 0240053c..c1c9edbe 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/utils/ClassTree.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/utils/ClassTree.java @@ -16,9 +16,7 @@ package com.javadeobfuscator.deobfuscator.utils; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; public class ClassTree { diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/utils/InstructionModifier.java b/src/main/java/com/javadeobfuscator/deobfuscator/utils/InstructionModifier.java index da0bfe86..aa012d30 100644 --- a/src/main/java/com/javadeobfuscator/deobfuscator/utils/InstructionModifier.java +++ b/src/main/java/com/javadeobfuscator/deobfuscator/utils/InstructionModifier.java @@ -18,7 +18,6 @@ import org.objectweb.asm.tree.*; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,6 +35,7 @@ public class InstructionModifier { public void append(AbstractInsnNode original, InsnList append) { appends.put(original, append); } + public void prepend(AbstractInsnNode original, InsnList append) { prepends.put(original, append); }