Remove calls to deprecated MethodMatcher methods

openrewrite · Feb 23, 2024 · 7105dbc · 7105dbc
1 parent e2a69f4
commit 7105dbc
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertions.java b/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertions.java
@@ -77,8 +77,8 @@ public Set<String> getTags() {
     }
 
     @Override
-    public Validated validate() {
-        Validated validated = super.validate()
+    public Validated<Object> validate() {
+        Validated<Object> validated = super.validate()
                 .and(Validated.required("assertions", DEFAULT_ASSERTIONS));
         if (validated.isValid()) {
             validated = validated.and(Validated.test(
@@ -189,17 +189,13 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Set<M
             Set<J.Block> methodBodies = new HashSet<>();
 
             methodMatchers.forEach(matcher -> {
-                Set<J.Block> declarationBodies = matcherPatternToClassInvocation.computeIfAbsent(matcherPattern(matcher),
+                Set<J.Block> declarationBodies = matcherPatternToClassInvocation.computeIfAbsent(matcher.toString(),
                         k -> findMethodDeclarations(classDeclaration, matcher));
                 methodBodies.addAll(declarationBodies);
             });
             return methodBodies.stream().anyMatch(this::methodHasAssertion);
         }
 
-        private String matcherPattern(MethodMatcher methodMatcher) {
-            return methodMatcher.getTargetTypePattern() + " " + methodMatcher.getMethodNamePattern() + "(" + methodMatcher.getArgumentPattern() + ")";
-        }
-
         private Set<J.Block> findMethodDeclarations(J.ClassDeclaration classDeclaration, MethodMatcher methodMatcher) {
             JavaIsoVisitor<Set<J.Block>> findMethodDeclarationVisitor = new JavaIsoVisitor<Set<J.Block>>() {
                 @Override