Skip to content

Commit b683d1a

Browse files
GaoYushanTwGaoYushanTw
committed
refactor: remove unused interface Processor
1 parent e49cf0c commit b683d1a

File tree

10 files changed

+55
-46
lines changed

10 files changed

+55
-46
lines changed

‎src/main/java/org/jd/core/v1/model/processor/Processor.java‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/ClassFileToJavaSyntaxProcessor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.jd.core.v1.api.loader.Loader;
1111
import org.jd.core.v1.model.message.DecompileContext;
12-
import org.jd.core.v1.model.processor.Processor;
1312
import org.jd.core.v1.service.converter.classfiletojavasyntax.processor.ConvertClassFileProcessor;
1413
import org.jd.core.v1.service.converter.classfiletojavasyntax.processor.UpdateJavaSyntaxTreeProcessor;
1514
import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker;
@@ -24,7 +23,7 @@
2423
*
2524
* @see ConvertClassFileProcessor
2625
*/
27-
public class ClassFileToJavaSyntaxProcessor implements Processor {
26+
public class ClassFileToJavaSyntaxProcessor {
2827
protected static final ConvertClassFileProcessor CONVERT_CLASS_FILE_PROCESSOR = new ConvertClassFileProcessor();
2928
protected static final UpdateJavaSyntaxTreeProcessor UPDATE_JAVA_SYNTAX_TREE_PROCESSOR = new UpdateJavaSyntaxTreeProcessor();
3029

‎src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/ConvertClassFileProcessor.java‎

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,55 @@
1111
import org.jd.core.v1.model.classfile.Constants;
1212
import org.jd.core.v1.model.classfile.Field;
1313
import org.jd.core.v1.model.classfile.Method;
14-
import org.jd.core.v1.model.classfile.attribute.*;
15-
import org.jd.core.v1.model.classfile.constant.*;
14+
import org.jd.core.v1.model.classfile.attribute.Annotations;
15+
import org.jd.core.v1.model.classfile.attribute.AttributeAnnotationDefault;
16+
import org.jd.core.v1.model.classfile.attribute.AttributeCode;
17+
import org.jd.core.v1.model.classfile.attribute.AttributeConstantValue;
18+
import org.jd.core.v1.model.classfile.attribute.AttributeLineNumberTable;
19+
import org.jd.core.v1.model.classfile.attribute.AttributeModule;
20+
import org.jd.core.v1.model.classfile.attribute.ModuleInfo;
21+
import org.jd.core.v1.model.classfile.attribute.PackageInfo;
22+
import org.jd.core.v1.model.classfile.attribute.ServiceInfo;
23+
import org.jd.core.v1.model.classfile.constant.Constant;
24+
import org.jd.core.v1.model.classfile.constant.ConstantDouble;
25+
import org.jd.core.v1.model.classfile.constant.ConstantFloat;
26+
import org.jd.core.v1.model.classfile.constant.ConstantInteger;
27+
import org.jd.core.v1.model.classfile.constant.ConstantLong;
28+
import org.jd.core.v1.model.classfile.constant.ConstantUtf8;
29+
import org.jd.core.v1.model.classfile.constant.ConstantValue;
1630
import org.jd.core.v1.model.javasyntax.CompilationUnit;
17-
import org.jd.core.v1.model.javasyntax.declaration.*;
18-
import org.jd.core.v1.model.javasyntax.expression.*;
31+
import org.jd.core.v1.model.javasyntax.declaration.Declaration;
32+
import org.jd.core.v1.model.javasyntax.declaration.ExpressionVariableInitializer;
33+
import org.jd.core.v1.model.javasyntax.declaration.FieldDeclarator;
34+
import org.jd.core.v1.model.javasyntax.declaration.ModuleDeclaration;
35+
import org.jd.core.v1.model.javasyntax.declaration.TypeDeclaration;
36+
import org.jd.core.v1.model.javasyntax.expression.DoubleConstantExpression;
37+
import org.jd.core.v1.model.javasyntax.expression.Expression;
38+
import org.jd.core.v1.model.javasyntax.expression.FloatConstantExpression;
39+
import org.jd.core.v1.model.javasyntax.expression.IntegerConstantExpression;
40+
import org.jd.core.v1.model.javasyntax.expression.LongConstantExpression;
41+
import org.jd.core.v1.model.javasyntax.expression.StringConstantExpression;
1942
import org.jd.core.v1.model.javasyntax.reference.BaseAnnotationReference;
2043
import org.jd.core.v1.model.javasyntax.reference.ElementValue;
21-
import org.jd.core.v1.model.javasyntax.type.*;
44+
import org.jd.core.v1.model.javasyntax.type.BaseType;
45+
import org.jd.core.v1.model.javasyntax.type.BaseTypeParameter;
46+
import org.jd.core.v1.model.javasyntax.type.GenericType;
47+
import org.jd.core.v1.model.javasyntax.type.Type;
48+
import org.jd.core.v1.model.javasyntax.type.TypeArgument;
49+
import org.jd.core.v1.model.javasyntax.type.TypeParameter;
50+
import org.jd.core.v1.model.javasyntax.type.TypeParameterWithTypeBounds;
2251
import org.jd.core.v1.model.message.DecompileContext;
23-
import org.jd.core.v1.model.processor.Processor;
24-
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.*;
52+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileAnnotationDeclaration;
53+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileBodyDeclaration;
54+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileClassDeclaration;
55+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileConstructorDeclaration;
56+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileConstructorOrMethodDeclaration;
57+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileEnumDeclaration;
58+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileFieldDeclaration;
59+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileInterfaceDeclaration;
60+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileMethodDeclaration;
61+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileStaticInitializerDeclaration;
62+
import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.declaration.ClassFileTypeDeclaration;
2563
import org.jd.core.v1.service.converter.classfiletojavasyntax.util.AnnotationConverter;
2664
import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker;
2765
import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.PopulateBindingsWithTypeParameterVisitor;
@@ -32,15 +70,15 @@
3270
import java.util.List;
3371
import java.util.Map;
3472

35-
import static org.jd.core.v1.model.classfile.Constants.*;
73+
import static org.jd.core.v1.model.classfile.Constants.ACC_STATIC;
3674

3775
/**
3876
* Convert ClassFile model to Java syntax model.<br><br>
3977
*
4078
* Input: {@link org.jd.core.v1.model.classfile.ClassFile}<br>
4179
* Output: {@link org.jd.core.v1.model.javasyntax.CompilationUnit}<br>
4280
*/
43-
public class ConvertClassFileProcessor implements Processor {
81+
public class ConvertClassFileProcessor {
4482
protected PopulateBindingsWithTypeParameterVisitor populateBindingsWithTypeParameterVisitor = new PopulateBindingsWithTypeParameterVisitor() {
4583
@Override
4684
public void visit(TypeParameter parameter) {
@@ -53,7 +91,6 @@ public void visit(TypeParameterWithTypeBounds parameter) {
5391
}
5492
};
5593

56-
@Override
5794
public void process(DecompileContext decompileContext) throws Exception {
5895
TypeMaker typeMaker = decompileContext.getTypeMaker();
5996
ClassFile classFile = decompileContext.getBody();

‎src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/UpdateJavaSyntaxTreeProcessor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.jd.core.v1.model.javasyntax.CompilationUnit;
1111
import org.jd.core.v1.model.message.DecompileContext;
12-
import org.jd.core.v1.model.processor.Processor;
1312
import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker;
1413
import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.UpdateJavaSyntaxTreeStep0Visitor;
1514
import org.jd.core.v1.service.converter.classfiletojavasyntax.visitor.UpdateJavaSyntaxTreeStep1Visitor;
@@ -21,9 +20,8 @@
2120
* Input: {@link CompilationUnit}<br>
2221
* Output: {@link CompilationUnit}<br>
2322
*/
24-
public class UpdateJavaSyntaxTreeProcessor implements Processor {
23+
public class UpdateJavaSyntaxTreeProcessor {
2524

26-
@Override
2725
public void process(DecompileContext decompileContext) throws Exception {
2826
TypeMaker typeMaker = decompileContext.getTypeMaker();
2927
CompilationUnit compilationUnit = decompileContext.getBody();

‎src/main/java/org/jd/core/v1/service/deserializer/classfile/DeserializeClassFileProcessor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@
1010
import org.jd.core.v1.api.loader.Loader;
1111
import org.jd.core.v1.model.classfile.ClassFile;
1212
import org.jd.core.v1.model.message.DecompileContext;
13-
import org.jd.core.v1.model.processor.Processor;
1413

1514
/**
1615
* Create a ClassFile model from a loader and a internal type name.<br><br>
1716
*
1817
* Input: -<br>
1918
* Output: {@link org.jd.core.v1.model.classfile.ClassFile}<br>
2019
*/
21-
public class DeserializeClassFileProcessor extends ClassFileDeserializer implements Processor {
20+
public class DeserializeClassFileProcessor extends ClassFileDeserializer {
2221

23-
@Override
2422
public void process(DecompileContext decompileContext) throws Exception {
2523
Loader loader = decompileContext.getLoader();
2624
String internalTypeName = decompileContext.getMainInternalTypeName();

‎src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/JavaSyntaxToJavaFragmentProcessor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.jd.core.v1.model.javafragment.ImportsFragment;
1212
import org.jd.core.v1.model.javasyntax.CompilationUnit;
1313
import org.jd.core.v1.model.message.DecompileContext;
14-
import org.jd.core.v1.model.processor.Processor;
1514
import org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.visitor.CompilationUnitVisitor;
1615
import org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.visitor.SearchImportsVisitor;
1716

@@ -21,7 +20,7 @@
2120
* Input: {@link org.jd.core.v1.model.javasyntax.CompilationUnit}<br>
2221
* Output: List<{@link org.jd.core.v1.model.fragment.Fragment}><br>
2322
*/
24-
public class JavaSyntaxToJavaFragmentProcessor implements Processor {
23+
public class JavaSyntaxToJavaFragmentProcessor {
2524

2625
public void process(DecompileContext decompileContext) throws Exception {
2726
Loader loader = decompileContext.getLoader();

‎src/main/java/org/jd/core/v1/service/layouter/LayoutFragmentProcessor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.jd.core.v1.model.fragment.FlexibleFragment;
1212
import org.jd.core.v1.model.fragment.Fragment;
1313
import org.jd.core.v1.model.message.DecompileContext;
14-
import org.jd.core.v1.model.processor.Processor;
1514
import org.jd.core.v1.service.layouter.model.Section;
1615
import org.jd.core.v1.service.layouter.util.VisitorsHolder;
1716
import org.jd.core.v1.service.layouter.visitor.BuildSectionsVisitor;
@@ -29,9 +28,8 @@
2928
* Input: List<{@link Fragment}><br>
3029
* Output: List<{@link Fragment}><br>
3130
*/
32-
public class LayoutFragmentProcessor implements Processor {
31+
public class LayoutFragmentProcessor {
3332

34-
@Override
3533
public void process(DecompileContext decompileContext) throws Exception {
3634
int maxLineNumber = decompileContext.getMaxLineNumber();
3735
boolean containsByteCode = decompileContext.isContainsByteCode();

‎src/main/java/org/jd/core/v1/service/tokenizer/javafragmenttotoken/JavaFragmentToTokenProcessor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.jd.core.v1.model.javafragment.JavaFragment;
1111
import org.jd.core.v1.model.message.DecompileContext;
12-
import org.jd.core.v1.model.processor.Processor;
1312
import org.jd.core.v1.service.tokenizer.javafragmenttotoken.visitor.TokenizeJavaFragmentVisitor;
1413

1514
import java.util.List;
@@ -20,9 +19,8 @@
2019
* Input: List<{@link org.jd.core.v1.model.fragment.Fragment}><br>
2120
* Output: List<{@link org.jd.core.v1.model.token.Token}><br>
2221
*/
23-
public class JavaFragmentToTokenProcessor implements Processor {
22+
public class JavaFragmentToTokenProcessor {
2423

25-
@Override
2624
public void process(DecompileContext decompileContext) throws Exception {
2725
List<JavaFragment> fragments = decompileContext.getBody();
2826
TokenizeJavaFragmentVisitor visitor = new TokenizeJavaFragmentVisitor(fragments.size() * 3);

‎src/main/java/org/jd/core/v1/service/writer/WriteTokenProcessor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.jd.core.v1.api.printer.Printer;
1111
import org.jd.core.v1.model.message.DecompileContext;
12-
import org.jd.core.v1.model.processor.Processor;
1312
import org.jd.core.v1.model.token.Token;
1413
import org.jd.core.v1.service.writer.visitor.PrintTokenVisitor;
1514

@@ -21,9 +20,8 @@
2120
* Input: List<{@link org.jd.core.v1.model.token.Token}><br>
2221
* Output: -<br>
2322
*/
24-
public class WriteTokenProcessor implements Processor {
23+
public class WriteTokenProcessor {
2524

26-
@Override
2725
public void process(DecompileContext decompileContext) throws Exception {
2826
Printer printer = decompileContext.getPrinter();
2927
List<Token> tokens = decompileContext.getBody();

‎src/test/java/org/jd/core/v1/services/tokenizer/javafragmenttotoken/TestTokenizeJavaFragmentProcessor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99

1010
import org.jd.core.v1.model.javafragment.JavaFragment;
1111
import org.jd.core.v1.model.message.DecompileContext;
12-
import org.jd.core.v1.model.processor.Processor;
1312
import org.jd.core.v1.services.tokenizer.javafragmenttotoken.visitor.TokenizeJavaFragmentTestVisitor;
1413

1514
import java.util.List;
1615

17-
public class TestTokenizeJavaFragmentProcessor implements Processor {
16+
public class TestTokenizeJavaFragmentProcessor {
1817

19-
@Override
2018
public void process(DecompileContext decompileContext) throws Exception {
2119
List<JavaFragment> fragments = decompileContext.getBody();
2220
TokenizeJavaFragmentTestVisitor visitor = new TokenizeJavaFragmentTestVisitor(fragments.size() * 3);

0 commit comments

Comments
 (0)