fix(spoon): Fix visitor not returning any result because of correct i…

…mplemented visitor (#847)
MartinWitt · Jul 15, 2023 · c65ac44 · c65ac44
1 parent 62444c5
commit c65ac44
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 20 deletions.
diff --git a/spoon-analyzer/src/main/java/io/github/martinwitt/spoon_analyzer/BadSmell.java b/spoon-analyzer/src/main/java/io/github/martinwitt/spoon_analyzer/BadSmell.java
@@ -10,9 +10,7 @@ public interface BadSmell {
 
     CtType<?> getAffectedType();
 
-    default <T> T accept(BadSmellVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
+    <T> T accept(BadSmellVisitor<T> visitor);
 
     /**
      * Fixes the bad smell. Fixing means changing the source code in a way that the bad smell is not present anymore.

diff --git a/spoon-analyzer/src/main/java/io/github/martinwitt/spoon_analyzer/BadSmellVisitor.java b/spoon-analyzer/src/main/java/io/github/martinwitt/spoon_analyzer/BadSmellVisitor.java
@@ -19,15 +19,6 @@
  */
 public interface BadSmellVisitor<U> extends Visitor<BadSmell, U> {
 
-    /**
-     * Visits a generic bad smell, which is not further specified. This method is called if no other method is more specific.
-     * @param badSmell  the bad smell to visit
-     * @return  the result of the visit
-     */
-    default U visit(BadSmell badSmell) {
-        return emptyResult();
-    }
-
     default U visit(IndexOfReplaceableByContains badSmell) {
         return emptyResult();
     }

diff --git a/spoon-analyzer/src/main/java/io/github/martinwitt/spoon_analyzer/SpoonAnalyzer.java b/spoon-analyzer/src/main/java/io/github/martinwitt/spoon_analyzer/SpoonAnalyzer.java
@@ -72,12 +72,4 @@ public List<BadSmell> analyze(String path) {
         }
         return badSmells;
     }
-
-    public static void main(String[] args) {
-        var analyzer = new SpoonAnalyzer();
-        var badSmells = analyzer.analyze("./assertj-assertions-generator-maven-plugin");
-        for (BadSmell badSmell : badSmells) {
-            logger.atInfo().log(badSmell.toString());
-        }
-    }
 }
diff --git a/...on_analyzer/badsmells/Index_off_replaceable_by_contains/IndexOfReplaceableByContains.java b/...on_analyzer/badsmells/Index_off_replaceable_by_contains/IndexOfReplaceableByContains.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.Index_off_replaceable_by_contains;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.declaration.CtType;
 
@@ -60,4 +61,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...rtinwitt/spoon_analyzer/badsmells/access_static_via_instance/AccessStaticViaInstance.java b/...rtinwitt/spoon_analyzer/badsmells/access_static_via_instance/AccessStaticViaInstance.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.access_static_via_instance;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.code.CtInvocation;
 import spoon.reflect.declaration.CtType;
 
@@ -54,4 +55,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...er/badsmells/array_can_be_replaced_with_enum_values/ArrayCanBeReplacedWithEnumValues.java b/...er/badsmells/array_can_be_replaced_with_enum_values/ArrayCanBeReplacedWithEnumValues.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.array_can_be_replaced_with_enum_values;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.code.CtNewArray;
 import spoon.reflect.declaration.CtType;
 
@@ -37,4 +38,9 @@ public CtType<?> getAffectedType() {
     public CtNewArray<?> getAffectedElement() {
         return affectedElement;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...artinwitt/spoon_analyzer/badsmells/charset_object_can_be_used/CharsetObjectCanBeUsed.java b/...artinwitt/spoon_analyzer/badsmells/charset_object_can_be_used/CharsetObjectCanBeUsed.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.charset_object_can_be_used;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.code.CtConstructorCall;
 import spoon.reflect.code.CtInvocation;
 import spoon.reflect.declaration.CtType;
@@ -71,4 +72,9 @@ public String toString() {
         return "CharsetObjectCanBeUsed [affectedType=" + affectedType.getQualifiedName() + ", invocation=" + invocation
                 + "]";
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/.../io/github/martinwitt/spoon_analyzer/badsmells/final_static_method/FinalStaticMethod.java b/.../io/github/martinwitt/spoon_analyzer/badsmells/final_static_method/FinalStaticMethod.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.final_static_method;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.declaration.CtMethod;
 import spoon.reflect.declaration.CtType;
 
@@ -38,4 +39,9 @@ public CtType<?> getAffectedType() {
     public CtMethod<?> getMethod() {
         return method;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...b/martinwitt/spoon_analyzer/badsmells/innerclass_may_be_static/InnerClassMayBeStatic.java b/...b/martinwitt/spoon_analyzer/badsmells/innerclass_may_be_static/InnerClassMayBeStatic.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.innerclass_may_be_static;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.declaration.CtType;
 
 public class InnerClassMayBeStatic implements BadSmell {
@@ -50,4 +51,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...s/non_protected_constructor_In_abstract_class/NonProtectedConstructorInAbstractClass.java b/...s/non_protected_constructor_In_abstract_class/NonProtectedConstructorInAbstractClass.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.non_protected_constructor_In_abstract_class;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.declaration.CtConstructor;
 import spoon.reflect.declaration.CtType;
 
@@ -51,4 +52,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...o/github/martinwitt/spoon_analyzer/badsmells/private_final_method/PrivateFinalMethod.java b/...o/github/martinwitt/spoon_analyzer/badsmells/private_final_method/PrivateFinalMethod.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.private_final_method;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.declaration.CtMethod;
 import spoon.reflect.declaration.CtType;
 
@@ -51,4 +52,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...nwitt/spoon_analyzer/badsmells/size_replaceable_by_is_empty/SizeReplaceableByIsEmpty.java b/...nwitt/spoon_analyzer/badsmells/size_replaceable_by_is_empty/SizeReplaceableByIsEmpty.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.size_replaceable_by_is_empty;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.code.CtBinaryOperator;
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.code.CtInvocation;
@@ -62,4 +63,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/...hub/martinwitt/spoon_analyzer/badsmells/unnecessary_implements/UnnecessaryImplements.java b/...hub/martinwitt/spoon_analyzer/badsmells/unnecessary_implements/UnnecessaryImplements.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.unnecessary_implements;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.declaration.CtType;
 import spoon.reflect.reference.CtTypeReference;
 
@@ -63,4 +64,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }
diff --git a/.../github/martinwitt/spoon_analyzer/badsmells/unnecessary_tostring/UnnecessaryTostring.java b/.../github/martinwitt/spoon_analyzer/badsmells/unnecessary_tostring/UnnecessaryTostring.java
@@ -1,6 +1,7 @@
 package io.github.martinwitt.spoon_analyzer.badsmells.unnecessary_tostring;
 
 import io.github.martinwitt.spoon_analyzer.BadSmell;
+import io.github.martinwitt.spoon_analyzer.BadSmellVisitor;
 import spoon.reflect.code.CtInvocation;
 import spoon.reflect.declaration.CtType;
 
@@ -47,4 +48,9 @@ public void fix() {
     public boolean isFixable() {
         return true;
     }
+
+    @Override
+    public <T> T accept(BadSmellVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 }