refactor: split body to real field

GaoYushanTw · GaoYushanTw · commit cc8d957c2921 · 2020-11-28T10:25:06.000+08:00
diff --git a/src/main/java/org/jd/core/v1/ClassFileToJavaSourceDecompiler.java b/src/main/java/org/jd/core/v1/ClassFileToJavaSourceDecompiler.java
@@ -53,7 +53,7 @@ public void decompile(Loader loader, Printer printer, String internalName, Map<S
     protected void decompile(DecompileContext decompileContext) throws Exception {
         ClassFile classFile = this.deserializer.loadClassFile(decompileContext.getLoader(),
                 decompileContext.getMainInternalTypeName());
-        decompileContext.setBody(classFile);
+        decompileContext.setClassFile(classFile);
 
         this.converter.process(decompileContext);
         this.fragmenter.process(decompileContext);
diff --git a/src/main/java/org/jd/core/v1/model/message/DecompileContext.java b/src/main/java/org/jd/core/v1/model/message/DecompileContext.java
@@ -11,7 +11,12 @@
 import lombok.Setter;
 import org.jd.core.v1.api.loader.Loader;
 import org.jd.core.v1.api.printer.Printer;
+import org.jd.core.v1.model.classfile.ClassFile;
+import org.jd.core.v1.model.fragment.Fragment;
+import org.jd.core.v1.model.javasyntax.CompilationUnit;
+import org.jd.core.v1.model.token.Token;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker;
+import org.jd.core.v1.util.DefaultList;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,19 +36,27 @@ public class DecompileContext {
     protected boolean containsByteCode;
     protected boolean showBridgeAndSynthetic;
 
+    protected ClassFile classFile;
+    protected CompilationUnit compilationUnit;
+    protected DefaultList<Token> tokens;
+
+    @Deprecated
     protected Object body;
 
     public DecompileContext() {}
 
-    public DecompileContext(Object body) {
-        this.body = body;
+    @Deprecated
+    public DecompileContext(DefaultList<Fragment> fragments) {
+        this.body = fragments;
     }
     
     @SuppressWarnings("unchecked")
+    @Deprecated
     public <T> T getBody() {
         return (T)body;
     }
 
+    @Deprecated
     public void setBody(Object body) {
         this.body = body;
     }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/ConvertClassFileProcessor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/ConvertClassFileProcessor.java
@@ -93,7 +93,7 @@ public void visit(TypeParameterWithTypeBounds parameter) {
 
     public void process(DecompileContext decompileContext) throws Exception {
         TypeMaker typeMaker = decompileContext.getTypeMaker();
-        ClassFile classFile = decompileContext.getBody();
+        ClassFile classFile = decompileContext.getClassFile();
 
         AnnotationConverter annotationConverter = new AnnotationConverter(typeMaker);
 
@@ -113,7 +113,7 @@ public void process(DecompileContext decompileContext) throws Exception {
 
         decompileContext.setMajorVersion(classFile.getMajorVersion());
         decompileContext.setMinorVersion(classFile.getMinorVersion());
-        decompileContext.setBody(new CompilationUnit(typeDeclaration));
+        decompileContext.setCompilationUnit(new CompilationUnit(typeDeclaration));
     }
 
     protected ClassFileInterfaceDeclaration convertInterfaceDeclaration(TypeMaker parser, AnnotationConverter converter, ClassFile classFile, ClassFileBodyDeclaration outerClassFileBodyDeclaration) {
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/UpdateJavaSyntaxTreeProcessor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/processor/UpdateJavaSyntaxTreeProcessor.java
@@ -24,7 +24,7 @@ public class UpdateJavaSyntaxTreeProcessor {
 
     public void process(DecompileContext decompileContext) throws Exception {
         TypeMaker typeMaker = decompileContext.getTypeMaker();
-        CompilationUnit compilationUnit = decompileContext.getBody();
+        CompilationUnit compilationUnit = decompileContext.getCompilationUnit();
 
         new UpdateJavaSyntaxTreeStep0Visitor(typeMaker).visit(compilationUnit);
         new UpdateJavaSyntaxTreeStep1Visitor(typeMaker).visit(compilationUnit);
diff --git a/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/JavaSyntaxToJavaFragmentProcessor.java b/src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/JavaSyntaxToJavaFragmentProcessor.java
@@ -26,7 +26,7 @@ public void process(DecompileContext decompileContext) throws Exception {
         Loader loader = decompileContext.getLoader();
         String mainInternalTypeName = decompileContext.getMainInternalTypeName();
         int majorVersion = decompileContext.getMajorVersion();
-        CompilationUnit compilationUnit = decompileContext.getBody();
+        CompilationUnit compilationUnit = decompileContext.getCompilationUnit();
 
         SearchImportsVisitor importsVisitor = new SearchImportsVisitor(loader, mainInternalTypeName);
         importsVisitor.visit(compilationUnit);
diff --git a/src/main/java/org/jd/core/v1/service/tokenizer/javafragmenttotoken/JavaFragmentToTokenProcessor.java b/src/main/java/org/jd/core/v1/service/tokenizer/javafragmenttotoken/JavaFragmentToTokenProcessor.java
@@ -30,6 +30,6 @@ public void process(DecompileContext decompileContext) throws Exception {
             fragment.accept(visitor);
         }
 
-        decompileContext.setBody(visitor.getTokens());
+        decompileContext.setTokens(visitor.getTokens());
     }
 }
diff --git a/src/main/java/org/jd/core/v1/service/writer/WriteTokenProcessor.java b/src/main/java/org/jd/core/v1/service/writer/WriteTokenProcessor.java
@@ -24,7 +24,7 @@ public class WriteTokenProcessor {
 
     public void process(DecompileContext decompileContext) throws Exception {
         Printer printer = decompileContext.getPrinter();
-        List<Token> tokens = decompileContext.getBody();
+        List<Token> tokens = decompileContext.getTokens();
         PrintTokenVisitor visitor = new PrintTokenVisitor();
         int maxLineNumber = decompileContext.getMaxLineNumber();
         int majorVersion = decompileContext.getMajorVersion();
diff --git a/src/test/java/org/jd/core/v1/AbstractJdTest.java b/src/test/java/org/jd/core/v1/AbstractJdTest.java
@@ -31,7 +31,7 @@ protected String decompile(Loader loader, Printer printer, String internalTypeNa
         decompileContext.setConfiguration(configuration);
 
         ClassFile classFile = deserializer.loadClassFile(loader, internalTypeName);
-        decompileContext.setBody(classFile);
+        decompileContext.setClassFile(classFile);
 
         converter.process(decompileContext);
         fragmenter.process(decompileContext);
diff --git a/src/test/java/org/jd/core/v1/AnnotationConverterTest.java b/src/test/java/org/jd/core/v1/AnnotationConverterTest.java
@@ -39,7 +39,7 @@ public void test() throws Exception {
         decompileContext.setLoader(loader);
 
         ClassFile classFile = deserializer.loadClassFile(loader, decompileContext.getMainInternalTypeName());
-        decompileContext.setBody(classFile);
+        decompileContext.setClassFile(classFile);
 
         // Check class
         assertNotNull(classFile);
diff --git a/src/test/java/org/jd/core/v1/ClassFileDeserializerTest.java b/src/test/java/org/jd/core/v1/ClassFileDeserializerTest.java
@@ -60,7 +60,7 @@ public void testAnnotatedClass() throws Exception {
         decompileContext.setLoader(loader);
 
         ClassFile classFile = deserializer.loadClassFile(loader, decompileContext.getMainInternalTypeName());
-        decompileContext.setBody(classFile);
+        decompileContext.setClassFile(classFile);
 
         // Check class
         assertNotNull(classFile);
diff --git a/src/test/java/org/jd/core/v1/ControlFlowGraphTest.java b/src/test/java/org/jd/core/v1/ControlFlowGraphTest.java
@@ -2671,11 +2671,11 @@ protected Method searchMethod(Loader loader, TypeMaker typeMaker, String interna
         decompileContext.setTypeMaker(typeMaker);
 
         ClassFile classFile = deserializer.loadClassFile(loader, internalTypeName);
-        decompileContext.setBody(classFile);
+        decompileContext.setClassFile(classFile);
 
         converter.process(decompileContext);
 
-        CompilationUnit compilationUnit = decompileContext.getBody();
+        CompilationUnit compilationUnit = decompileContext.getCompilationUnit();
 
         assertNotNull(compilationUnit);
 
diff --git a/src/test/java/org/jd/core/v1/JarFileToJavaSourceTest.java b/src/test/java/org/jd/core/v1/JarFileToJavaSourceTest.java
@@ -163,7 +163,7 @@ protected void test(InputStream inputStream) throws Exception {
                     try {
                         // Decompile class
                         ClassFile classFile = deserializer.loadClassFile(loader, internalTypeName);
-                        decompileContext.setBody(classFile);
+                        decompileContext.setClassFile(classFile);
 
                         converter.process(decompileContext);
                         fragmenter.process(decompileContext);
diff --git a/src/test/java/org/jd/core/v1/JavaFragmentToTokenTest.java b/src/test/java/org/jd/core/v1/JavaFragmentToTokenTest.java
@@ -939,6 +939,7 @@ public DecompileContext createMessageToTestIfReturn(int lineNumber1, int lineNum
         JavaFragmentFactory.addSpacerBetweenStatements(fragments);
 
         DecompileContext decompileContext = new DecompileContext(fragments);
+        decompileContext.setBody(fragments);
         decompileContext.setMaxLineNumber(Integer.valueOf(lineNumber2));
 
         return decompileContext;
diff --git a/src/test/java/org/jd/core/v1/JavaSyntaxToJavaSourceTest.java b/src/test/java/org/jd/core/v1/JavaSyntaxToJavaSourceTest.java
@@ -140,7 +140,8 @@ public void testClassDeclaration() throws Exception {
 
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
         Map<String, Object> configuration = Collections.singletonMap("realignLineNumbers", Boolean.TRUE);
-        DecompileContext decompileContext = new DecompileContext(compilationUnit);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setCompilationUnit(compilationUnit);
 
         decompileContext.setMainInternalTypeName("org/jd/core/v1/service/test/TokenWriterTest");
         decompileContext.setLoader(new NopLoader());
@@ -181,7 +182,8 @@ public void testInterfaceDeclaration() throws Exception {
         );
 
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
-        DecompileContext decompileContext = new DecompileContext(compilationUnit);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setCompilationUnit(compilationUnit);
 
         decompileContext.setMainInternalTypeName("org/jd/core/v1/service/test/InterfaceTest");
         decompileContext.setLoader(new NopLoader());
@@ -231,7 +233,8 @@ public void testEnumDayDeclaration() throws Exception {
         );
 
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
-        DecompileContext decompileContext = new DecompileContext(compilationUnit);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setCompilationUnit(compilationUnit);
 
         decompileContext.setMainInternalTypeName("org/jd/core/v1/service/test/Day");
         decompileContext.setLoader(new NopLoader());
@@ -515,7 +518,8 @@ public void testEnumPlanetDeclaration() throws Exception {
         );
 
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
-        DecompileContext decompileContext = new DecompileContext(compilationUnit);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setCompilationUnit(compilationUnit);
 
         decompileContext.setMainInternalTypeName("org/jd/core/v1/service/test/Planet");
         decompileContext.setLoader(new NopLoader());
@@ -584,7 +588,8 @@ public void testSwitch() throws Exception {
         );
 
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
-        DecompileContext decompileContext = new DecompileContext(compilationUnit);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setCompilationUnit(compilationUnit);
 
         decompileContext.setMainInternalTypeName("org/jd/core/v1/service/test/SwitchTest");
         decompileContext.setLoader(new NopLoader());
@@ -640,7 +645,8 @@ public void testBridgeAndSyntheticAttributes() throws Exception {
         );
 
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
-        DecompileContext decompileContext = new DecompileContext(compilationUnit);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setCompilationUnit(compilationUnit);
 
         decompileContext.setMainInternalTypeName("org/jd/core/v1/service/test/SyntheticAttributeTest");
         decompileContext.setLoader(new NopLoader());
diff --git a/src/test/java/org/jd/core/v1/SignatureParserTest.java b/src/test/java/org/jd/core/v1/SignatureParserTest.java
@@ -41,7 +41,7 @@ public void testAnnotatedClass() throws Exception {
         decompileContext.setLoader(loader);
 
         ClassFile classFile = deserializer.loadClassFile(loader, decompileContext.getMainInternalTypeName());
-        decompileContext.setBody(classFile);
+        decompileContext.setClassFile(classFile);
 
         // Check type
         TypeMaker.TypeTypes typeTypes = typeMaker.parseClassFileSignature(classFile);
@@ -158,7 +158,7 @@ public void testGenericClass() throws Exception {
         decompileContext.setLoader(loader);
 
         ClassFile classFile = deserializer.loadClassFile(loader, decompileContext.getMainInternalTypeName());
-        decompileContext.setBody(classFile);
+        decompileContext.setClassFile(classFile);
 
         // Check type
         TypeMaker.TypeTypes typeTypes = typeMaker.parseClassFileSignature(classFile);
diff --git a/src/test/java/org/jd/core/v1/WriteTokenTest.java b/src/test/java/org/jd/core/v1/WriteTokenTest.java
@@ -198,7 +198,8 @@ public void writeClassDeclaration() throws Exception {
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
         WriteTokenProcessor writer = new WriteTokenProcessor();
 
-        DecompileContext decompileContext = new DecompileContext(tokens);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setTokens(tokens);
         decompileContext.setPrinter(printer);
         decompileContext.setMaxLineNumber(22);
         decompileContext.setMajorVersion(0);
@@ -279,7 +280,8 @@ public void testComments() throws Exception {
         PlainTextMetaPrinter printer = new PlainTextMetaPrinter();
         WriteTokenProcessor writer = new WriteTokenProcessor();
 
-        DecompileContext decompileContext = new DecompileContext(tokens);
+        DecompileContext decompileContext = new DecompileContext();
+        decompileContext.setTokens(tokens);
         decompileContext.setPrinter(printer);
         decompileContext.setMaxLineNumber(0);
         decompileContext.setMajorVersion(0);
diff --git a/src/test/java/org/jd/core/v1/services/tokenizer/javafragmenttotoken/TestTokenizeJavaFragmentProcessor.java b/src/test/java/org/jd/core/v1/services/tokenizer/javafragmenttotoken/TestTokenizeJavaFragmentProcessor.java
@@ -24,6 +24,6 @@ public void process(DecompileContext decompileContext) throws Exception {
             fragment.accept(visitor);
         }
 
-        decompileContext.setBody(visitor.getTokens());
+        decompileContext.setTokens(visitor.getTokens());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ public void process(DecompileContext decompileContext) throws Exception {`
`30`	`30`	`fragment.accept(visitor);`
`31`	`31`	`}`
`32`	`32`
`33`		`- decompileContext.setBody(visitor.getTokens());`
	`33`	`+ decompileContext.setTokens(visitor.getTokens());`
`34`	`34`	`}`
`35`	`35`	`}`