This is a refactor and test case fix

build.gradle

@@ -5,6 +5,9 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
 dependencies {
+    compileOnly 'org.projectlombok:lombok:1.18.12'
+    annotationProcessor 'org.projectlombok:lombok:1.18.12'
+
     testCompile 'commons-codec:commons-codec:1.13'
     testCompile 'org.apache.commons:commons-collections4:4.1'
     testCompile 'org.apache.commons:commons-imaging:1.0-alpha1'

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+# distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip

src/main/java/org/jd/core/v1/ClassFileToJavaSourceDecompiler.java

@@ -10,51 +10,59 @@
 import org.jd.core.v1.api.Decompiler;
 import org.jd.core.v1.api.loader.Loader;
 import org.jd.core.v1.api.printer.Printer;
-import org.jd.core.v1.model.message.Message;
+import org.jd.core.v1.model.classfile.ClassFile;
+import org.jd.core.v1.model.javasyntax.CompilationUnit;
+import org.jd.core.v1.model.message.DecompileContext;
+import org.jd.core.v1.model.token.Token;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.ClassFileToJavaSyntaxProcessor;
-import org.jd.core.v1.service.deserializer.classfile.DeserializeClassFileProcessor;
+import org.jd.core.v1.service.deserializer.classfile.ClassFileDeserializer;
 import org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.JavaSyntaxToJavaFragmentProcessor;
 import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
 import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
 import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.jd.core.v1.util.DefaultList;
 
 import java.util.Map;
 
 public class ClassFileToJavaSourceDecompiler implements Decompiler {
-    protected DeserializeClassFileProcessor deserializer = new DeserializeClassFileProcessor();
+    protected ClassFileDeserializer deserializer = new ClassFileDeserializer();
     protected ClassFileToJavaSyntaxProcessor converter = new ClassFileToJavaSyntaxProcessor();
     protected JavaSyntaxToJavaFragmentProcessor fragmenter = new JavaSyntaxToJavaFragmentProcessor();
     protected LayoutFragmentProcessor layouter = new LayoutFragmentProcessor();
     protected JavaFragmentToTokenProcessor tokenizer = new JavaFragmentToTokenProcessor();
     protected WriteTokenProcessor writer = new WriteTokenProcessor();
 
     public void decompile(Loader loader, Printer printer, String internalName) throws Exception {
-        Message message = new Message();
+        DecompileContext decompileContext = new DecompileContext();
 
-        message.setHeader("mainInternalTypeName", internalName);
-        message.setHeader("loader", loader);
-        message.setHeader("printer", printer);
+        decompileContext.setMainInternalTypeName(internalName);
+        decompileContext.setLoader(loader);
+        decompileContext.setPrinter(printer);
 
-        decompile(message);
+        decompile(decompileContext);
     }
 
     public void decompile(Loader loader, Printer printer, String internalName, Map<String, Object> configuration) throws Exception {
-        Message message = new Message();
+        DecompileContext decompileContext = new DecompileContext();
 
-        message.setHeader("mainInternalTypeName", internalName);
-        message.setHeader("configuration", configuration);
-        message.setHeader("loader", loader);
-        message.setHeader("printer", printer);
+        decompileContext.setMainInternalTypeName(internalName);
+        decompileContext.setConfiguration(configuration);
+        decompileContext.setLoader(loader);
+        decompileContext.setPrinter(printer);
 
-        decompile(message);
+        decompile(decompileContext);
     }
 
-    protected void decompile(Message message) throws Exception {
-        this.deserializer.process(message);
-        this.converter.process(message);
-        this.fragmenter.process(message);
-        this.layouter.process(message);
-        this.tokenizer.process(message);
-        this.writer.process(message);
+    protected void decompile(DecompileContext decompileContext) throws Exception {
+        ClassFile classFile = this.deserializer.loadClassFile(decompileContext.getLoader(),
+                decompileContext.getMainInternalTypeName());
+        decompileContext.setClassFile(classFile);
+
+        CompilationUnit compilationUnit = this.converter.process(decompileContext);
+        this.fragmenter.process(compilationUnit, decompileContext);
+        this.layouter.process(decompileContext);
+        DefaultList<Token> tokens = this.tokenizer.process(decompileContext.getBody());
+        decompileContext.setTokens(tokens);
+        this.writer.process(decompileContext);
     }
 }

src/main/java/org/jd/core/v1/model/javafragment/JavaFragment.java

@@ -7,6 +7,8 @@
 
 package org.jd.core.v1.model.javafragment;
 
-public interface JavaFragment {
+import org.jd.core.v1.model.fragment.Fragment;
+
+public interface JavaFragment extends Fragment {
     void accept(JavaFragmentVisitor visitor);
 }

src/main/java/org/jd/core/v1/model/message/DecompileContext.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use,
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.core.v1.model.message;
+
+import lombok.Getter;
+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;
+
+@Getter
+@Setter
+public class DecompileContext {
+    protected String mainInternalTypeName;
+    protected Map<String, Object> configuration = new HashMap<>();
+    protected Loader loader;
+    protected Printer printer;
+
+    protected TypeMaker typeMaker;
+    protected int majorVersion;
+    protected int minorVersion;
+    protected int maxLineNumber = Printer.UNKNOWN_LINE_NUMBER;
+    protected boolean containsByteCode;
+    protected boolean showBridgeAndSynthetic;
+
+    protected ClassFile classFile;
+    protected CompilationUnit compilationUnit;
+    protected DefaultList<Token> tokens;
+
+    @Deprecated
+    protected Object body;
+
+    public DecompileContext() {}
+
+    @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;
+    }
+}

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

@@ -8,14 +8,12 @@
 package org.jd.core.v1.service.converter.classfiletojavasyntax;
 
 import org.jd.core.v1.api.loader.Loader;
-import org.jd.core.v1.model.message.Message;
-import org.jd.core.v1.model.processor.Processor;
+import org.jd.core.v1.model.javasyntax.CompilationUnit;
+import org.jd.core.v1.model.message.DecompileContext;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.processor.ConvertClassFileProcessor;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.processor.UpdateJavaSyntaxTreeProcessor;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.TypeMaker;
 
-import java.util.Map;
-
 /**
  * Convert ClassFile model to Java syntax model.<br><br>
  *
@@ -24,36 +22,23 @@
  *
  * @see ConvertClassFileProcessor
  */
-public class ClassFileToJavaSyntaxProcessor implements Processor {
+public class ClassFileToJavaSyntaxProcessor {
     protected static final ConvertClassFileProcessor CONVERT_CLASS_FILE_PROCESSOR = new ConvertClassFileProcessor();
     protected static final UpdateJavaSyntaxTreeProcessor UPDATE_JAVA_SYNTAX_TREE_PROCESSOR = new UpdateJavaSyntaxTreeProcessor();
 
-    public void process(Message message) throws Exception {
-        Loader loader = message.getHeader("loader");
-        Map<String, Object> configuration = message.getHeader("configuration");
-
-        if (configuration == null) {
-            message.setHeader("typeMaker", new TypeMaker(loader));
-        } else {
-            TypeMaker typeMaker = null;
-
-            try {
-                typeMaker = (TypeMaker)configuration.get("typeMaker");
+    public CompilationUnit process(DecompileContext decompileContext) throws Exception {
+        Loader loader = decompileContext.getLoader();
 
-                if (typeMaker == null) {
-                    // Store the heavy weight object 'typeMaker' in 'configuration' to reuse it
-                    configuration.put("typeMaker", typeMaker=new TypeMaker(loader));
-                }
-            } catch (Exception e) {
-                if (typeMaker == null) {
-                    typeMaker = new TypeMaker(loader);
-                }
-            }
-
-            message.setHeader("typeMaker", typeMaker);
+        TypeMaker typeMaker = decompileContext.getTypeMaker();
+        if (typeMaker == null) {
+            typeMaker = new TypeMaker(loader);
+            decompileContext.setTypeMaker(typeMaker);
         }
 
-        CONVERT_CLASS_FILE_PROCESSOR.process(message);
-        UPDATE_JAVA_SYNTAX_TREE_PROCESSOR.process(message);
+        CompilationUnit compilationUnit = CONVERT_CLASS_FILE_PROCESSOR.process(decompileContext.getClassFile(), typeMaker, decompileContext);
+        decompileContext.setCompilationUnit(compilationUnit);
+
+        UPDATE_JAVA_SYNTAX_TREE_PROCESSOR.process(compilationUnit, typeMaker);
+        return compilationUnit;
     }
 }