put ClassInfo into cache earlier to allow referencing from its members

Author: ZZZank

src/main/java/com/probejs/info/clazz/BaseMemberInfo.java

@@ -7,7 +7,6 @@
 
 @Data
 @AllArgsConstructor
-@NoArgsConstructor
 public class BaseMemberInfo {
     protected String name;
     protected IType type;

src/main/java/com/probejs/info/clazz/ClassInfo.java

@@ -28,13 +28,11 @@ public static ClassInfo ofCache(Class<?> clazz) {
         }
         //No computeIfAbsent because new ClassInfo will call ofCache for superclass lookup
         //This will cause a CME because multiple updates occurred in one computeIfAbsent
-        ClassInfo cInfo = ALL.get(clazz);
+        val cInfo = ALL.get(clazz);
         if (cInfo != null) {
             return cInfo;
         }
-        cInfo = new ClassInfo(clazz);
-        ALL.put(clazz, cInfo);
-        return cInfo;
+        return new ClassInfo(clazz, true);
     }
 
     private final Class<?> raw;
@@ -50,7 +48,10 @@ public static ClassInfo ofCache(Class<?> clazz) {
     private final IType superType;
     private final List<IType> interfaces;
 
-    private ClassInfo(Class<?> clazz) {
+    private ClassInfo(Class<?> clazz, boolean putInCache) {
+        if (putInCache) {
+            ALL.put(clazz, this);
+        }
         this.raw = clazz;
         this.name = raw.getName();
         this.modifiers = raw.getModifiers();

src/main/java/com/probejs/info/clazz/FieldInfo.java

@@ -16,6 +16,7 @@ public class FieldInfo extends BaseMemberInfo implements Comparable<FieldInfo> {
     private final int modifiers;
     private final boolean shouldHide;
     private final Object staticValue;
+    private final ClassInfo from;
 
     private static String getRemappedOrDefault(Field field, Class<?> clazz) {
         String mapped = RemapperBridge.getRemapper().getMappedField(clazz, field);
@@ -28,6 +29,7 @@ private static String getRemappedOrDefault(Field field, Class<?> clazz) {
     public FieldInfo(Field field, Class<?> clazz) {
         super(getRemappedOrDefault(field, clazz), TypeResolver.resolveType(field.getGenericType()));
         this.raw = field;
+        this.from = ClassInfo.ofCache(clazz);
         this.modifiers = field.getModifiers();
         this.shouldHide = field.getAnnotation(HideFromJS.class) != null;
         this.staticValue = PUtil.tryOrDefault(() -> isStatic() ? field.get(null) : null, null);

src/main/java/com/probejs/info/clazz/MethodInfo.java

@@ -23,7 +23,7 @@ public class MethodInfo extends BaseMemberInfo {
     /**
      * the classInfo that the method belongs to is NOT in info cache when MethodInfo is being constructed
      */
-    private final Class<?> from;
+    private final ClassInfo from;
     @Setter
     private List<ParamInfo> params;
     @Setter
@@ -43,7 +43,7 @@ public MethodInfo(Method method, Class<?> from) {
         super(getRemappedOrDefault(method, from), TypeResolver.resolveType(method.getGenericReturnType()));
         this.raw = method;
         this.shouldHide = method.getAnnotation(HideFromJS.class) != null;
-        this.from = from;
+        this.from = ClassInfo.ofCache(from);
         this.modifiers = method.getModifiers();
         this.params = Arrays.stream(method.getParameters()).map(ParamInfo::new).collect(Collectors.toList());
         this.typeVariables = Arrays.stream(method.getTypeParameters())
@@ -65,8 +65,7 @@ public static class ParamInfo extends BaseMemberInfo {
         private final boolean isVarArgs;
 
         public ParamInfo(Parameter parameter) {
-            this.name = parameter.getName();
-            this.type = TypeResolver.resolveType(parameter.getParameterizedType());
+            super(parameter.getName(), TypeResolver.resolveType(parameter.getParameterizedType()));
             this.isVarArgs = parameter.isVarArgs();
         }
     }