Remove all reflection 'invoke' method calls

Author: emmanue1

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

@@ -23,8 +23,6 @@
 import java.util.ListIterator;
 
 import static org.jd.core.v1.model.javasyntax.statement.ContinueStatement.CONTINUE;
-import static org.jd.core.v1.service.converter.classfiletojavasyntax.util.ReflectionUtil.getExpression;
-import static org.jd.core.v1.service.converter.classfiletojavasyntax.util.ReflectionUtil.invokeGetter;
 
 public class LoopStatementMaker {
     protected static final RemoveLastContinueStatementVisitor REMOVE_LAST_CONTINUE_STATEMENT_VISITOR = new RemoveLastContinueStatementVisitor();
@@ -378,7 +376,19 @@ protected static Statement makeForEachArray(LocalVariableMaker localVariableMake
         }
 
         // String s = arr$[i$];
-        boe = invokeGetter(subStatements.get(0), getExpression, BinaryOperatorExpression.class);
+        statement = subStatements.getFirst();
+
+        if (statement.getClass() != ExpressionStatement.class) {
+            return null;
+        }
+
+        expression = ((ExpressionStatement)statement).getExpression();
+
+        if (expression.getClass() != BinaryOperatorExpression.class) {
+            return null;
+        }
+
+        boe = (BinaryOperatorExpression)expression;
 
         if ((boe.getRightExpression().getClass() != ArrayExpression.class) || (boe.getLeftExpression().getClass() != ClassFileLocalVariableReferenceExpression.class) || (boe.getLineNumber() != condition.getLineNumber())) {
             return null;
@@ -401,7 +411,19 @@ protected static Statement makeForEachArray(LocalVariableMaker localVariableMake
         }
 
         // arr$ = array;
-        boe = invokeGetter(statements.get(statementsSize-3), getExpression, BinaryOperatorExpression.class);
+        statement = statements.get(statementsSize-3);
+
+        if (statement.getClass() != ExpressionStatement.class) {
+            return null;
+        }
+
+        expression = ((ExpressionStatement)statement).getExpression();
+
+        if (expression.getClass() != BinaryOperatorExpression.class) {
+            return null;
+        }
+
+        boe = (BinaryOperatorExpression)expression;
 
         if (boe.getLeftExpression().getClass() != ClassFileLocalVariableReferenceExpression.class) {
             return null;
@@ -413,9 +435,21 @@ protected static Statement makeForEachArray(LocalVariableMaker localVariableMake
         Expression array = boe.getRightExpression();
 
         // i$ = 0;
-        boe = invokeGetter(statements.get(statementsSize-1), getExpression, BinaryOperatorExpression.class);
+        statement = statements.get(statementsSize-1);
+
+        if (statement.getClass() != ExpressionStatement.class) {
+            return null;
+        }
+
+        expression = ((ExpressionStatement)statement).getExpression();
+
+        if (expression.getClass() != BinaryOperatorExpression.class) {
+            return null;
+        }
+
+        boe = (BinaryOperatorExpression)expression;
 
-        if ((boe == null) || (boe.getLineNumber() != lineNumber) || (boe.getLeftExpression().getClass() != ClassFileLocalVariableReferenceExpression.class) || (boe.getRightExpression().getClass() != IntegerConstantExpression.class)) {
+        if ((boe.getLineNumber() != lineNumber) || (boe.getLeftExpression().getClass() != ClassFileLocalVariableReferenceExpression.class) || (boe.getRightExpression().getClass() != IntegerConstantExpression.class)) {
             return null;
         }
         if ((((IntegerConstantExpression)boe.getRightExpression()).getValue() != 0) || (((ClassFileLocalVariableReferenceExpression)boe.getLeftExpression()).getLocalVariable() != syntheticIndex)) {

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

@@ -227,14 +227,16 @@ private boolean recursiveIsAssignable(String parentInternalName, String childInt
             }
         }
 
-        for (String name : superClassAndInterfaceNames) {
-            if (parentInternalName.equals(name))
-                return true;
-        }
+        if (superClassAndInterfaceNames != null) {
+            for (String name : superClassAndInterfaceNames) {
+                if (parentInternalName.equals(name))
+                    return true;
+            }
 
-        for (String name : superClassAndInterfaceNames) {
-            if (recursiveIsAssignable(parentInternalName, name))
-                return true;
+            for (String name : superClassAndInterfaceNames) {
+                if (recursiveIsAssignable(parentInternalName, name))
+                    return true;
+            }
         }
 
         return false;