refactoring

Author: FelixAnthonisen

src/main/java/anthonisen/felix/annotationProcessing/VarianceProcessor.java

@@ -1,7 +1,6 @@
 package anthonisen.felix.annotationProcessing;
 
 import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.expr.Name;
 import com.github.javaparser.ast.type.Type;
 import java.util.HashSet;
 import java.util.Set;

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

@@ -28,9 +28,9 @@
 import javax.tools.Diagnostic.Kind;
 
 public class Covariancer {
-    private Messager messager;
-    private String sourceFolder;
-    private SourceRoot sourceRoot;
+    private final Messager messager;
+    private final String sourceFolder;
+    private final SourceRoot sourceRoot;
 
     public Covariancer(Messager messager, String sourceFolder) {
         this.messager = messager;
@@ -47,7 +47,6 @@ public void eraseTypesAndInsertCasts(String cls, String packageName, String type
         assert dir.isDirectory();
 
         ClassData classData = computeClassData(cls, packageName, typeOfInterest);
-        System.out.println(classData);
         Map<String, MethodData> methodMap = new HashMap<>();
 
         sourceRoot.parse(packageName, cls).accept(new MethodCollector(Arrays.asList(typeOfInterest)),

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

@@ -13,8 +13,7 @@
 import com.github.javaparser.ast.type.Type;
 
 public class MethodCollector extends VoidVisitorAdapter<Map<String, MethodData>> {
-
-    Set<String> typeParameters = new HashSet<>();
+    private final Set<String> typeParameters = new HashSet<>();
 
     public MethodCollector(Collection<String> typeParameters) {
         this.typeParameters.addAll(typeParameters);

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

@@ -8,8 +8,7 @@
 import anthonisen.felix.astParsing.util.TypeHandler;
 
 public class TypeEraserVisitor extends ModifierVisitor<Void> {
-
-    private ClassData classData;
+    private final ClassData classData;
 
     public TypeEraserVisitor(ClassData classData) {
         this.classData = classData;

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

@@ -13,7 +13,7 @@
 import com.github.javaparser.ast.type.Type;
 
 public class VariableCollector extends VoidVisitorAdapter<Set<Pair<String, String>>> {
-    ClassData classData;
+    private final ClassData classData;
 
     public VariableCollector(ClassData classData) {
         this.classData = classData;