JavaExecutable: Change to get TypeVars on-demand instead of ahead of time

JavaField: Changed to get EvalType on-demand instead of ahead of time

Author: reportmill

src/javakit/resolver/JavaExecutable.java

@@ -33,12 +33,14 @@ public JavaExecutable(Resolver aResolver, DeclType aType, JavaClass aDeclaringCl
 
         // Get VarArgs
         _varArgs = anExecutable.isVarArgs();
+    }
 
-        // Get TypeVariables
-        TypeVariable<?>[] typeVars = anExecutable.getTypeParameters();
-        _typeVars = new JavaTypeVariable[typeVars.length];
-        for (int i = 0, iMax = typeVars.length; i < iMax; i++)
-            _typeVars[i] = new JavaTypeVariable(_resolver, this, typeVars[i]);
+    /**
+     * Returns the executable.
+     */
+    private Executable getExecutable()
+    {
+        return this instanceof JavaMethod ? ((JavaMethod) this).getMethod() : ((JavaConstructor) this).getConstructor();
     }
 
     /**
@@ -49,14 +51,28 @@ public JavaExecutable(Resolver aResolver, DeclType aType, JavaClass aDeclaringCl
     /**
      * Returns the TypeVars.
      */
-    public JavaTypeVariable[] getTypeVars()  { return _typeVars; }
+    public JavaTypeVariable[] getTypeVars()
+    {
+        if (_typeVars != null) return _typeVars;
+
+        // Get TypeVariables
+        Executable executable = getExecutable();
+        TypeVariable<?>[] typeVars = executable.getTypeParameters();
+        JavaTypeVariable[] javaTypeVars = new JavaTypeVariable[typeVars.length];
+        for (int i = 0, iMax = typeVars.length; i < iMax; i++)
+            javaTypeVars[i] = new JavaTypeVariable(_resolver, this, typeVars[i]);
+
+        // Set and return
+        return _typeVars = javaTypeVars;
+    }
 
     /**
      * Returns the TypeVar with given name.
      */
     public JavaTypeVariable getTypeVarForName(String aName)
     {
-        return ArrayUtils.findMatch(_typeVars, tvar -> tvar.getName().equals(aName));
+        JavaTypeVariable[] typeVars = getTypeVars();
+        return ArrayUtils.findMatch(typeVars, tvar -> tvar.getName().equals(aName));
     }
 
     /**
@@ -85,10 +101,10 @@ public JavaType[] getParameterTypes()
         if (_parameterTypes != null) return _parameterTypes;
 
         // Get GenericParameterTypes (this can fail https://bugs.openjdk.java.net/browse/JDK-8075483))
-        Executable exec = this instanceof JavaMethod ? ((JavaMethod) this).getMethod() : ((JavaConstructor) this).getConstructor();
-        Type[] paramTypesReal = exec.getGenericParameterTypes();
-        if (paramTypesReal.length < exec.getParameterCount())
-            paramTypesReal = exec.getParameterTypes();
+        Executable executable = getExecutable();
+        Type[] paramTypesReal = executable.getGenericParameterTypes();
+        if (paramTypesReal.length < executable.getParameterCount())
+            paramTypesReal = executable.getParameterTypes();
 
         JavaType[] parameterTypes = _resolver.getJavaTypesForTypes(paramTypesReal);
 

src/javakit/resolver/JavaField.java

@@ -19,14 +19,11 @@ public class JavaField extends JavaMember {
     public JavaField(Resolver aResolver, JavaClass aDeclaringClass, Field aField)
     {
         super(aResolver, DeclType.Field, aDeclaringClass, aField);
-        if (aField == null) return;
+        if (aField == null)
+            return;
 
         // Set field
         _field = aField;
-
-        // Set EvalType
-        Type fieldType = aField.getGenericType();
-        _evalType = _resolver.getJavaTypeForType(fieldType);
     }
 
     /**
@@ -38,6 +35,18 @@ public boolean isEnumConstant()
         return fieldClass != null && fieldClass.isEnum();
     }
 
+    /**
+     * Override to get eval type dynamically.
+     */
+    @Override
+    public JavaType getEvalType()
+    {
+        if (_evalType != null) return _evalType;
+        Type fieldType = _field.getGenericType();
+        JavaType evalType = _resolver.getJavaTypeForType(fieldType);
+        return _evalType = evalType;
+    }
+
     /**
      * Evaluates field for given object.
      */
@@ -64,7 +73,7 @@ public String getSuggestionString()
         String evalTypeName = evalType != null ? evalType.getSimpleName() : null;
 
         // Construct string: SimpleName : EvalType.SimpleName
-        StringBuffer sb = new StringBuffer(simpleName);
+        StringBuilder sb = new StringBuilder(simpleName);
         if (evalTypeName != null)
             sb.append(" - ").append(evalTypeName);