find all classes and fields of interest

Author: FelixAnthonisen

src/main/java/anthonisen/felix/astParsing/Covariancer.java

@@ -4,34 +4,50 @@
 import com.github.javaparser.utils.CodeGenerationUtils;
 import com.github.javaparser.utils.SourceRoot;
 
+import anthonisen.felix.astParsing.util.MethodData;
+import anthonisen.felix.astParsing.visitors.CastInsertionVisitor;
+import anthonisen.felix.astParsing.visitors.MethodCollector;
+import anthonisen.felix.astParsing.visitors.TypeEraserVisitor;
+import anthonisen.felix.astParsing.visitors.VariableCollector;
+import anthonisen.felix.astParsing.visitors.ClassCollector;
+
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 public class Covariancer {
 
     public void makeCovariant() {
-        String sourceFolder = "src/main/java/anthonisen/felix/example";
+        String sourceFolder = "example";
         SourceRoot sourceRoot = new SourceRoot(
                 CodeGenerationUtils.mavenModuleRoot(Covariancer.class).resolve(sourceFolder));
         MethodCollector collector = new MethodCollector(Arrays.asList("T"));
         Map<String, MethodData> methodMap = new HashMap<>();
+        Set<String> classesToWatch = new HashSet<String>();
         sourceRoot.parse("", "Herd.java").accept(collector, methodMap);
 
         File dir = Paths.get(sourceFolder).toFile();
         assert dir.exists();
         assert dir.isDirectory();
-
         for (File file : dir.listFiles()) {
             CompilationUnit cu = sourceRoot.parse("", file.getName());
-            CastInsertionVisitor vis = new CastInsertionVisitor("catHerd", methodMap);
-            cu.accept(vis, null);
-            System.out.println(cu);
+            cu.accept(new ClassCollector(), classesToWatch);
+        }
+        for (File file : dir.listFiles()) {
+            CompilationUnit cu = sourceRoot.parse("", file.getName());
+            Set<String> varsToWatch = new HashSet<>();
+            cu.accept(new VariableCollector(classesToWatch), varsToWatch);
+            cu.accept(new TypeEraserVisitor(), null);
+            for (String var : varsToWatch) {
+                CastInsertionVisitor castInsertionVisitor = new CastInsertionVisitor(var, methodMap);
+                cu.accept(castInsertionVisitor, null);
+
+            }
         }
-
         sourceRoot.saveAll(CodeGenerationUtils.mavenModuleRoot(Covariancer.class).resolve(Paths.get("output")));
-
     }
 }

src/main/java/anthonisen/felix/astParsing/util/TypeReplacer.java

@@ -8,7 +8,6 @@ public static boolean replaceTypes(Type type, String targetTypeName, String newT
         boolean found = false;
         if (type instanceof ClassOrInterfaceType) {
             ClassOrInterfaceType classType = (ClassOrInterfaceType) type;
-            System.out.println(type);
             if (classType.asString().equals(targetTypeName)) {
                 found = true;
                 classType.replace(new ClassOrInterfaceType(null, newTypeName));

src/main/java/anthonisen/felix/astParsing/visitors/ClassCollector.java

@@ -0,0 +1,16 @@
+package anthonisen.felix.astParsing.visitors;
+
+import java.util.Set;
+
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
+
+public class ClassCollector extends VoidVisitorAdapter<Set<String>> {
+    @Override
+    public void visit(ClassOrInterfaceDeclaration n, Set<String> arg) {
+        super.visit(n, arg);
+        if (n.getTypeParameters().isNonEmpty()) {
+            arg.add(n.getNameAsString());
+        }
+    }
+}

src/main/java/anthonisen/felix/astParsing/visitors/VariableCollector.java

@@ -0,0 +1,40 @@
+package anthonisen.felix.astParsing.visitors;
+
+import java.util.Set;
+
+import com.github.javaparser.ast.body.Parameter;
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import com.github.javaparser.ast.type.Type;
+
+public class VariableCollector extends VoidVisitorAdapter<Set<String>> {
+    Set<String> classesToWatch;
+
+    public VariableCollector(Set<String> classesToWatch) {
+        this.classesToWatch = classesToWatch;
+    }
+
+    @Override
+    public void visit(VariableDeclarator n, Set<String> arg) {
+        super.visit(n, arg);
+        handleType(n.getNameAsString(), n.getType(), arg);
+    }
+
+    @Override
+    public void visit(Parameter n, Set<String> arg) {
+        super.visit(n, arg);
+        handleType(n.getNameAsString(), n.getType(), arg);
+    }
+
+    private void handleType(String varName, Type type, Set<String> arg) {
+        if (!(type instanceof ClassOrInterfaceType))
+            return;
+
+        ClassOrInterfaceType classType = (ClassOrInterfaceType) type;
+
+        if (!classesToWatch.contains(classType.getNameAsString()))
+            return; // visit typeparams, if present
+        arg.add(varName);
+    }
+}