fix(spoon): NPE in InvocationMatcher (#830)

MartinWitt · Jul 13, 2023 · b333709 · b333709
1 parent 4f793d1
commit b333709
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/matcher/src/main/java/io/github/martinwitt/laughing_train/spoonutils/InvocationMatcher.java b/matcher/src/main/java/io/github/martinwitt/laughing_train/spoonutils/InvocationMatcher.java
@@ -70,7 +70,9 @@ public boolean matches(CtInvocation<?> element) {
         if (element.getArguments().size() != argsFQN.length) {
             return false;
         }
-
+        if (element.getArguments().stream().anyMatch(arg -> arg.getType() == null)) {
+            return false;
+        }
         List<Pair<CtTypeReference<?>, CtExpression<?>>> zipped = new ArrayList<>();
         for (int i = 0; i < argsFQN.length && i < element.getArguments().size(); i++) {
             zipped.add(Pair.of(

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
@@ -25,16 +25,16 @@ public class SpoonAnalyzer {
 
     public SpoonAnalyzer() {
         this.localAnalyzers = new ArrayList<>();
-        localAnalyzers.add(new IndexOfReplaceableByContainsAnalyzer());
         localAnalyzers.add(new AccessStaticViaInstanceAnalyzer());
         localAnalyzers.add(new ArrayCanBeReplacedWithEnumValuesAnalyzer());
         localAnalyzers.add(new CharsetObjectCanBeUsedAnalyzer());
+        localAnalyzers.add(new IndexOfReplaceableByContainsAnalyzer());
         localAnalyzers.add(new InnerClassMayBeStaticAnalyzer());
-        localAnalyzers.add(new UnnecessaryImplementsAnalyzer());
-        localAnalyzers.add(new UnnecessaryTostringAnalyzer());
         localAnalyzers.add(new NonProtectedConstructorInAbstractClassAnalyzer());
         localAnalyzers.add(new PrivateFinalMethodAnalyzer());
         localAnalyzers.add(new SizeReplaceableByIsEmptyAnalyzer());
+        localAnalyzers.add(new UnnecessaryImplementsAnalyzer());
+        localAnalyzers.add(new UnnecessaryTostringAnalyzer());
     }
 
     public List<BadSmell> analyze(String path) {