Prepare refactoring of ObjectTypeMaker and SignatureParser

emmanue1 · emmanue1 · commit f6b083718b74 · 2019-08-20T13:50:34.000+02:00
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/AnnotationConverter.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/AnnotationConverter.java
@@ -17,11 +17,11 @@
 import org.jd.core.v1.model.javasyntax.type.PrimitiveType;
 
 public class AnnotationConverter implements ElementValueVisitor {
-    protected ObjectTypeMaker factory;
+    protected ObjectTypeMaker objectTypeMaker;
     protected org.jd.core.v1.model.javasyntax.reference.ElementValue elementValue = null;
 
-    public AnnotationConverter(ObjectTypeMaker factory) {
-        this.factory = factory;
+    public AnnotationConverter(ObjectTypeMaker objectTypeMaker) {
+        this.objectTypeMaker = objectTypeMaker;
     }
 
     @SuppressWarnings("unchecked")
@@ -73,7 +73,7 @@ protected AnnotationReference convert(Annotation annotation) {
 
         assert (descriptor != null) && (descriptor.length() > 2) && (descriptor.charAt(0) == 'L') && (descriptor.charAt(descriptor.length()-1) == ';');
 
-        ObjectType ot = factory.makeFromDescriptor(descriptor);
+        ObjectType ot = objectTypeMaker.makeFromDescriptor(descriptor);
         ElementValuePair[] elementValuePairs = annotation.getElementValuePairs();
 
         if (elementValuePairs == null) {
@@ -145,7 +145,7 @@ public void visit(ElementValuePrimitiveType elementValuePrimitiveType) {
     @Override
     public void visit(ElementValueClassInfo elementValueClassInfo) {
         String classInfo = elementValueClassInfo.getClassInfo();
-        ObjectType ot = factory.makeFromDescriptor(classInfo);
+        ObjectType ot = objectTypeMaker.makeFromDescriptor(classInfo);
         elementValue = new ExpressionElementValue(new TypeReferenceDotClassExpression(ot));
     }
 
@@ -162,7 +162,7 @@ public void visit(ElementValueEnumConstValue elementValueEnumConstValue) {
 
         assert (descriptor != null) && (descriptor.length() > 2) && (descriptor.charAt(0) == 'L') && (descriptor.charAt(descriptor.length()-1) == ';') : "AnnotationConverter.visit(elementValueEnumConstValue)";
 
-        ObjectType ot = factory.makeFromDescriptor(descriptor);
+        ObjectType ot = objectTypeMaker.makeFromDescriptor(descriptor);
         String constName = elementValueEnumConstValue.getConstName();
         String internalTypeName = descriptor.substring(1, descriptor.length()-1);
         elementValue = new ExpressionElementValue(new FieldReferenceExpression(ot, new ObjectTypeReferenceExpression(ot), internalTypeName, constName, descriptor));
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java
@@ -88,7 +88,6 @@ public void parse(BasicBlock basicBlock, Statements<Statement> statements, Defau
         ConstantNameAndType constantNameAndType;
         String typeName, name, descriptor;
         ObjectType ot;
-        Type t;
         int i, count, value;
         AbstractLocalVariable localVariable;
 
@@ -218,8 +217,8 @@ public void parse(BasicBlock basicBlock, Statements<Statement> statements, Defau
                     valueRef = stack.pop();
                     indexRef = stack.pop();
                     arrayRef = stack.pop();
-                    t = arrayRef.getType();
-                    statements.add(new ExpressionStatement(new BinaryOperatorExpression(lineNumber, t.createType(t.getDimension()-1), new ArrayExpression(lineNumber, arrayRef, indexRef), "=", valueRef, 16)));
+                    type1 = arrayRef.getType();
+                    statements.add(new ExpressionStatement(new BinaryOperatorExpression(lineNumber, type1.createType(type1.getDimension()-1), new ArrayExpression(lineNumber, arrayRef, indexRef), "=", valueRef, 16)));
                     break;
                 case 80: // LASTORE
                     valueRef = stack.pop();
@@ -243,8 +242,8 @@ public void parse(BasicBlock basicBlock, Statements<Statement> statements, Defau
                     valueRef = stack.pop();
                     indexRef = stack.pop();
                     arrayRef = stack.pop();
-                    t = arrayRef.getType();
-                    statements.add(new ExpressionStatement(new BinaryOperatorExpression(lineNumber, t.createType(t.getDimension()>0 ? t.getDimension()-1 : 0), new ArrayExpression(lineNumber, arrayRef, indexRef), "=", valueRef, 16)));
+                    type1 = arrayRef.getType();
+                    statements.add(new ExpressionStatement(new BinaryOperatorExpression(lineNumber, type1.createType(type1.getDimension()>0 ? type1.getDimension()-1 : 0), new ArrayExpression(lineNumber, arrayRef, indexRef), "=", valueRef, 16)));
                     break;
                 case 84: // BASTORE
                     valueRef = stack.pop();
@@ -722,9 +721,7 @@ public void parse(BasicBlock basicBlock, Statements<Statement> statements, Defau
                 case 182: case 183: case 184: case 185: // INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE
                     constantMemberRef = constants.getConstant( ((code[++offset] & 255) << 8) | (code[++offset] & 255) );
                     typeName = constants.getConstantTypeName(constantMemberRef.getClassIndex());
-                    ot = (typeName.charAt(0) == '[') ?
-                        objectTypeMaker.makeFromDescriptor(typeName) :
-                        objectTypeMaker.makeFromInternalTypeName(typeName);
+                    ot = objectTypeMaker.makeFromDescriptorOrInternalTypeName(typeName);
                     constantNameAndType = constants.getConstant(constantMemberRef.getNameAndTypeIndex());
                     name = constants.getConstantUtf8(constantNameAndType.getNameIndex());
                     descriptor = constants.getConstantUtf8(constantNameAndType.getDescriptorIndex());
@@ -804,29 +801,25 @@ public void parse(BasicBlock basicBlock, Statements<Statement> statements, Defau
                     break;
                 case 192: // CHECKCAST
                     typeName = constants.getConstantTypeName( ((code[++offset] & 255) << 8) | (code[++offset] & 255) );
-                    t = (typeName.charAt(0) == '[') ?
-                            objectTypeMaker.makeFromDescriptor(typeName) :
-                            objectTypeMaker.makeFromInternalTypeName(typeName);
+                    type1 = objectTypeMaker.makeFromDescriptorOrInternalTypeName(typeName);
                     expression1 = stack.pop();
                     if (expression1.getClass() == CastExpression.class) {
                         // Skip double cast
-                        ((CastExpression)expression1).setType(t);
+                        ((CastExpression)expression1).setType(type1);
                     } else {
                         searchFirstLineNumberVisitor.init();
                         expression1.accept(searchFirstLineNumberVisitor);
-                        expression1 = new CastExpression(searchFirstLineNumberVisitor.getLineNumber(), t, expression1);
+                        expression1 = new CastExpression(searchFirstLineNumberVisitor.getLineNumber(), type1, expression1);
                     }
                     stack.push(expression1);
                     break;
                 case 193: // INSTANCEOF
                     typeName = constants.getConstantTypeName( ((code[++offset] & 255) << 8) | (code[++offset] & 255) );
-                    t = (typeName.charAt(0) == '[') ?
-                            objectTypeMaker.makeFromDescriptor(typeName) :
-                            objectTypeMaker.makeFromInternalTypeName(typeName);
-                    if (t == null) {
-                        t = PrimitiveTypeUtil.getPrimitiveTypeFromDescriptor(typeName);
+                    type1 = objectTypeMaker.makeFromDescriptorOrInternalTypeName(typeName);
+                    if (type1 == null) {
+                        type1 = PrimitiveTypeUtil.getPrimitiveTypeFromDescriptor(typeName);
                     }
-                    stack.push(new InstanceOfExpression(lineNumber, stack.pop(), t));
+                    stack.push(new InstanceOfExpression(lineNumber, stack.pop(), type1));
                     break;
                 case 194: // MONITORENTER
                     statements.add(new ClassFileMonitorEnterStatement(stack.pop()));
@@ -998,9 +991,7 @@ private void parseLDC(DefaultStack<Expression> stack, ConstantPool constants, in
             case Constant.CONSTANT_Class:
                 int typeNameIndex = ((ConstantClass) constant).getNameIndex();
                 String typeName = ((ConstantUtf8)constants.getConstant(typeNameIndex)).getValue();
-                Type type = (typeName.charAt(0) == '[') ?
-                        objectTypeMaker.makeFromDescriptor(typeName) :
-                        objectTypeMaker.makeFromInternalTypeName(typeName);
+                Type type = objectTypeMaker.makeFromDescriptorOrInternalTypeName(typeName);
                 if (type == null) {
                     type = PrimitiveTypeUtil.getPrimitiveTypeFromDescriptor(typeName);
                 }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ObjectTypeMaker.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ObjectTypeMaker.java
@@ -113,6 +113,10 @@ public ObjectType makeFromInternalTypeName(String internalTypeName) {
         return ot;
     }
 
+    public ObjectType makeFromDescriptorOrInternalTypeName(String descriptorOrInternalTypeName) {
+        return (descriptorOrInternalTypeName.charAt(0) == '[') ? makeFromDescriptor(descriptorOrInternalTypeName) : makeFromInternalTypeName(descriptorOrInternalTypeName);
+    }
+
     private ObjectType loadFromLoader(String internalTypeName) {
         try {
             ObjectType ot = internalTypeNameToObjectTypeCache.get(internalTypeName);
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateIntegerConstantTypeVisitor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/UpdateIntegerConstantTypeVisitor.java
@@ -19,7 +19,6 @@
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression.ClassFileNewExpression;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.model.javasyntax.expression.ClassFileSuperConstructorInvocationExpression;
 import org.jd.core.v1.service.converter.classfiletojavasyntax.util.PrimitiveTypeUtil;
-import org.jd.core.v1.service.converter.classfiletojavasyntax.util.SignatureParser;
 import org.jd.core.v1.util.DefaultList;
 
 import java.util.AbstractList;
diff --git a/src/test/java/org/jd/core/v1/AnnotationConverterTest.java b/src/test/java/org/jd/core/v1/AnnotationConverterTest.java
@@ -27,8 +27,8 @@ public class AnnotationConverterTest extends TestCase {
     public void test() throws Exception {
         InputStream is = this.getClass().getResourceAsStream("/zip/data-java-jdk-1.7.0.zip");
         ZipLoader loader = new ZipLoader(is);
-        ObjectTypeMaker factory = new ObjectTypeMaker(loader);
-        AnnotationConverter converter = new AnnotationConverter(factory);
+        ObjectTypeMaker objectTypeMaker = new ObjectTypeMaker(loader);
+        AnnotationConverter converter = new AnnotationConverter(objectTypeMaker);
         DeserializeClassFileProcessor deserializer = new DeserializeClassFileProcessor();
 
         Message message = new Message();
diff --git a/src/test/java/org/jd/core/v1/ControlFlowGraphTest.java b/src/test/java/org/jd/core/v1/ControlFlowGraphTest.java
@@ -34,13 +34,12 @@
 
 import static org.jd.core.v1.service.converter.classfiletojavasyntax.model.cfg.BasicBlock.*;
 
-
 public class ControlFlowGraphTest extends TestCase {
     protected DeserializeClassFileProcessor deserializer = new DeserializeClassFileProcessor();
     protected ConvertClassFileProcessor converter = new ConvertClassFileProcessor();
     protected ClassPathLoader loader = new ClassPathLoader();
-    protected ObjectTypeMaker factory = new ObjectTypeMaker(loader);
-    protected SignatureParser parser = new SignatureParser(factory);
+    protected ObjectTypeMaker objectTypeMaker = new ObjectTypeMaker(loader);
+    protected SignatureParser signatureParser = new SignatureParser(objectTypeMaker);
 
     // --- Basic test ----------------------------------------------------------------------------------------------- //
     @Test
@@ -2635,7 +2634,7 @@ protected InputStream loadFile(String zipName) throws IOException {
     }
 
     protected Method searchMethod(String internalTypeName, String methodName) throws Exception {
-        return searchMethod(loader, factory, parser, internalTypeName, methodName, null);
+        return searchMethod(loader, objectTypeMaker, signatureParser, internalTypeName, methodName, null);
     }
 
     protected Method searchMethod(InputStream is, String internalTypeName, String methodName) throws Exception {
@@ -2647,18 +2646,18 @@ protected Method searchMethod(InputStream is, String internalTypeName, String me
             return null;
         } else {
             ZipLoader loader = new ZipLoader(is);
-            ObjectTypeMaker factory = new ObjectTypeMaker(loader);
-            SignatureParser parser = new SignatureParser(factory);
-            return searchMethod(loader, factory, parser, internalTypeName, methodName, methodDescriptor);
+            ObjectTypeMaker objectTypeMaker = new ObjectTypeMaker(loader);
+            SignatureParser signatureParser = new SignatureParser(objectTypeMaker);
+            return searchMethod(loader, objectTypeMaker, signatureParser, internalTypeName, methodName, methodDescriptor);
         }
     }
 
-    protected Method searchMethod(Loader loader, ObjectTypeMaker factory, SignatureParser parser, String internalTypeName, String methodName, String methodDescriptor) throws Exception {
+    protected Method searchMethod(Loader loader, ObjectTypeMaker objectTypeMaker, SignatureParser signatureParser, String internalTypeName, String methodName, String methodDescriptor) throws Exception {
         Message message = new Message();
         message.setHeader("mainInternalTypeName", internalTypeName);
         message.setHeader("loader", loader);
-        message.setHeader("objectTypeMaker", factory);
-        message.setHeader("signatureParser", parser);
+        message.setHeader("objectTypeMaker", objectTypeMaker);
+        message.setHeader("signatureParser", signatureParser);
 
         deserializer.process(message);
         converter.process(message);
diff --git a/src/test/java/org/jd/core/v1/JarFileToJavaSourceTest.java b/src/test/java/org/jd/core/v1/JarFileToJavaSourceTest.java
@@ -95,9 +95,9 @@ protected void test(InputStream inputStream) throws Exception {
                     // Recompile source
                     String source = printer.toString();
 
-                    // TODO if (!CompilerUtil.compile("1.8", new JavaSourceFileObject(internalTypeName, source))) {
-                    // TODO     recompilationFailedCounter++;
-                    // TODO }
+                    if (!CompilerUtil.compile("1.8", new JavaSourceFileObject(internalTypeName, source))) {
+                        recompilationFailedCounter++;
+                    }
                 }
             }
 
@@ -128,7 +128,7 @@ protected void test(InputStream inputStream) throws Exception {
 
             assertTrue(exceptionCounter == 0);
             assertTrue(assertFailedCounter == 0);
-            // TODO assertTrue(recompilationFailedCounter == 0);
+            assertTrue(recompilationFailedCounter == 0);
         }
     }
 
diff --git a/src/test/java/org/jd/core/v1/SignatureParserTest.java b/src/test/java/org/jd/core/v1/SignatureParserTest.java

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,9 @@ protected void test(InputStream inputStream) throws Exception {`
`95`	`95`	`// Recompile source`
`96`	`96`	`String source = printer.toString();`
`97`	`97`
`98`		`- // TODO if (!CompilerUtil.compile("1.8", new JavaSourceFileObject(internalTypeName, source))) {`
`99`		`- // TODO recompilationFailedCounter++;`
`100`		`- // TODO }`
	`98`	`+ if (!CompilerUtil.compile("1.8", new JavaSourceFileObject(internalTypeName, source))) {`
	`99`	`+ recompilationFailedCounter++;`
	`100`	`+ }`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`@@ -128,7 +128,7 @@ protected void test(InputStream inputStream) throws Exception {`
`128`	`128`
`129`	`129`	`assertTrue(exceptionCounter == 0);`
`130`	`130`	`assertTrue(assertFailedCounter == 0);`
`131`		`- // TODO assertTrue(recompilationFailedCounter == 0);`
	`131`	`+ assertTrue(recompilationFailedCounter == 0);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`