OpenRewrite recipe best practices

timtebeek · TeamModerne · timtebeek · commit 10384e5055c4 · 2026-05-15T10:53:13.000Z
Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.recipes.rewrite.OpenRewriteRecipeBestPractices?organizationId=QUxML01vZGVybmUvTW9kZXJuZSArIE9wZW5SZXdyaXRl Co-authored-by: Moderne <team@moderne.io>
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/AdoptAssertJDurationAssertions.java b/src/main/java/org/openrewrite/java/testing/assertj/AdoptAssertJDurationAssertions.java
@@ -166,7 +166,7 @@ private J.MethodInvocation simplifyTimeUnits(J.MethodInvocation m, ExecutionCont
                         List<Object> unitInfo = getUnitInfo(m.getSimpleName(), Math.toIntExact(argValue));
                         String methodName = (String) unitInfo.get(0);
                         int methodArg = (int) unitInfo.get(1);
-                        if (!(m.getSimpleName().equals(methodName))) {
+                        if (!m.getSimpleName().equals(methodName)) {
                             // update method invocation with new name and arg
                             String template = String.format("#{any()}.%s(%d)", methodName, methodArg);
                             return applyTemplate(ctx, m, template, m.getSelect());
diff --git a/src/main/java/org/openrewrite/java/testing/dbrider/ExecutionListenerToDbRiderAnnotation.java b/src/main/java/org/openrewrite/java/testing/dbrider/ExecutionListenerToDbRiderAnnotation.java
@@ -198,7 +198,7 @@ public boolean shouldAddDbRiderAnnotation() {
         private boolean canTestExecutionListenerBeRemoved() {
             if (listener == null && listeners != null && listeners.getInitializer() != null &&
                 listeners.getInitializer().stream().allMatch(listener -> isTypeReference(listener, DBRIDER_TEST_EXECUTION_LISTENER))) {
-                return (getMigratedInheritListeners() == null && getMigratedMergeMode() != null);
+                return getMigratedInheritListeners() == null && getMigratedMergeMode() != null;
             }
             return false;
         }
diff --git a/src/main/java/org/openrewrite/java/testing/hamcrest/HamcrestMatcherToJUnit5.java b/src/main/java/org/openrewrite/java/testing/hamcrest/HamcrestMatcherToJUnit5.java
@@ -145,7 +145,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
 
                     //we do not handle nested matchers
                     if (!(matcherInvocation.getArguments().get(0) instanceof J.Empty)) {
-                        if ((matcherInvocation.getArguments().get(0).getType()).toString().startsWith("org.hamcrest")) {
+                        if (matcherInvocation.getArguments().get(0).getType().toString().startsWith("org.hamcrest")) {
                             return mi;
                         }
                     }
diff --git a/src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java b/src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java
@@ -340,7 +340,7 @@ private String getAnswerBody(J.MethodDeclaration md) {
             new JavaIsoVisitor<Set<String>>() {
                 @Override
                 public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, Set<String> ctx) {
-                    Cursor scope = getCursor().dropParentUntil((is) -> is instanceof J.ClassDeclaration || is instanceof J.Block || is instanceof J.MethodDeclaration || is instanceof J.ForLoop || is instanceof J.ForEachLoop || is instanceof J.ForLoop.Control || is instanceof J.ForEachLoop.Control || is instanceof J.Case || is instanceof J.Try || is instanceof J.Try.Resource || is instanceof J.Try.Catch || is instanceof J.MultiCatch || is instanceof J.Lambda || is instanceof JavaSourceFile);
+                    Cursor scope = getCursor().dropParentUntil(is -> is instanceof J.ClassDeclaration || is instanceof J.Block || is instanceof J.MethodDeclaration || is instanceof J.ForLoop || is instanceof J.ForEachLoop || is instanceof J.ForLoop.Control || is instanceof J.ForEachLoop.Control || is instanceof J.Case || is instanceof J.Try || is instanceof J.Try.Resource || is instanceof J.Try.Catch || is instanceof J.MultiCatch || is instanceof J.Lambda || is instanceof JavaSourceFile);
                     if (!VariableReferences.findRhsReferences(scope.getValue(), variable.getName()).isEmpty()) {
                         ctx.add(variable.getSimpleName());
                     }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java b/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java
@@ -32,7 +32,8 @@
 import org.openrewrite.java.tree.TypedTree;
 import org.openrewrite.marker.Markers;
 
-import java.util.Collections;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 
 public class AssertTrueInstanceofToAssertInstanceOf extends Recipe {
     @Getter
@@ -105,7 +106,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     .build();
 
                 maybeAddImport("org.junit.jupiter.api.Assertions", "assertInstanceOf");
-                TypedTree rawClazz = clazz instanceof J.ParameterizedType ? (TypedTree) ((J.ParameterizedType) clazz).getClazz() : clazz;
+                TypedTree rawClazz = clazz instanceof J.ParameterizedType ? ((J.ParameterizedType) clazz).getClazz() : clazz;
                 Expression classLiteral = toClassLiteral(rawClazz);
                 return reason != null ?
                     template.apply(getCursor(), mi.getCoordinates().replace(), classLiteral, expression, reason) :
@@ -116,9 +117,9 @@ private Expression toClassLiteral(TypedTree clazz) {
                 JavaType clazzType = clazz.getType();
                 JavaType.Parameterized classType = new JavaType.Parameterized(null,
                     JavaType.ShallowClass.build("java.lang.Class"),
-                    Collections.singletonList(clazzType != null ? clazzType : JavaType.Unknown.getInstance()));
+                    singletonList(clazzType != null ? clazzType : JavaType.Unknown.getInstance()));
                 J.Identifier classKeyword = new J.Identifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY,
-                    Collections.emptyList(), "class", classType, null);
+                    emptyList(), "class", classType, null);
                 Expression target = ((Expression) clazz).withPrefix(Space.EMPTY);
                 return new J.FieldAccess(Tree.randomId(), Space.EMPTY, Markers.EMPTY,
                     target, JLeftPadded.build(classKeyword), classType);
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/EnvironmentVariables.java b/src/main/java/org/openrewrite/java/testing/junit5/EnvironmentVariables.java
@@ -95,18 +95,18 @@ private static class EnvironmentVariablesVisitor extends JavaVisitor<ExecutionCo
                 return variableDecls;
             }
             J.VariableDeclarations vd = (J.VariableDeclarations) new Annotated.Matcher("@org.junit.*Rule").asVisitor(a ->
-                            (new JavaIsoVisitor<ExecutionContext>() {
+                            new JavaIsoVisitor<ExecutionContext>() {
                                 @Override
                                 public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) {
                                     return systemStubsTemplate(ctx).apply(updateCursor(annotation), annotation.getCoordinates().replace());
                                 }
-                            }).visit(a.getTree(), ctx, a.getCursor().getParentOrThrow()))
+                            }.visit(a.getTree(), ctx, a.getCursor().getParentOrThrow()))
                     .visit(variableDecls, ctx, getCursor().getParentOrThrow());
 
             if (variableDecls != vd) {
                 // put message to first enclosing ClassDeclaration, to inform that we have an env var rule.
                 getCursor()
-                        .dropParentUntil(c -> c instanceof J.ClassDeclaration)
+                        .dropParentUntil(J.ClassDeclaration.class::isInstance)
                         .putMessage(HAS_ENV_VAR_RULE, true);
             }
 
@@ -123,7 +123,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
                 int argCount = argCount(m);
                 J j =
                         getEnvVarClearTemplate(ctx, argCount)
-                                .apply(updateCursor(m), m.getCoordinates().replace(), (Object[]) getArgs(m, argCount));
+                                .apply(updateCursor(m), m.getCoordinates().replace(), getArgs(m, argCount));
 
                 if (getCursor().getParentTreeCursor().getValue() instanceof J.Block &&
                         !(j instanceof Statement)) {
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java b/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java
@@ -176,7 +176,7 @@ private boolean doTestParamsHaveCustomConverter(J.@Nullable MethodDeclaration me
                 return false;
             }
             return method.getParameters().stream()
-                    .filter(param -> param instanceof J.VariableDeclarations)
+                    .filter(J.VariableDeclarations.class::isInstance)
                     .map(J.VariableDeclarations.class::cast)
                     .anyMatch(v -> v.getLeadingAnnotations().stream().anyMatch(CONVERTER_MATCHER::matches));
         }
@@ -370,7 +370,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     method.getMethodType() != null &&
                     methodNames.contains(enclosingMethod.getSimpleName()) &&
                     method.getMethodType().getDeclaringType() == classType) {
-                Cursor classCursor = getCursor().dropParentUntil(j -> j instanceof J.ClassDeclaration);
+                Cursor classCursor = getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance);
                 classCursor.computeMessageIfAbsent(REFERENCED_METHODS, k -> new ArrayList<>()).add(method.getSimpleName());
             }
             return super.visitMethodInvocation(method, ctx);
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java b/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
@@ -31,6 +31,7 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import static java.util.Collections.emptyList;
@@ -196,7 +197,7 @@ private J.MethodDeclaration removeSpecificThrowsClause(J.MethodDeclaration metho
             });
 
             // If all throws were removed, return empty list, otherwise keep the remaining ones
-            if (filteredThrows.isEmpty() || filteredThrows.stream().allMatch(t -> t == null)) {
+            if (filteredThrows.isEmpty() || filteredThrows.stream().allMatch(Objects::isNull)) {
                 return method.withThrows(emptyList());
             }
 
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/CloseUnclosedStaticMocks.java b/src/main/java/org/openrewrite/java/testing/mockito/CloseUnclosedStaticMocks.java
@@ -364,7 +364,7 @@ private String tearDownMethodName(J.ClassDeclaration cd) {
 
         private boolean isVarDeclared(J.ClassDeclaration cd, String varName) {
             return cd.getBody().getStatements().stream()
-                    .filter(s -> s instanceof J.VariableDeclarations)
+                    .filter(J.VariableDeclarations.class::isInstance)
                     .map(J.VariableDeclarations.class::cast)
                     .flatMap(vd -> vd.getVariables().stream())
                     .anyMatch(var -> var.getSimpleName().equals(varName));
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/MockitoUtils.java b/src/main/java/org/openrewrite/java/testing/mockito/MockitoUtils.java
@@ -60,7 +60,7 @@ public static J.ClassDeclaration maybeAddMethodWithAnnotation(
                 .build()
                 .apply(
                         new Cursor(visitor.getCursor().getParentOrThrow(), classDecl),
-                        (firstTestMethod != null) ?
+                        firstTestMethod != null ?
                                 firstTestMethod.getCoordinates().before() :
                                 classDecl.getBody().getCoordinates().lastStatement()
                 );
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/MockitoWhenOnStaticToMockStatic.java b/src/main/java/org/openrewrite/java/testing/mockito/MockitoWhenOnStaticToMockStatic.java
@@ -324,7 +324,7 @@ private static boolean isMethodDeclarationWithAllAnnotations(@Nullable Statement
 
     private static String getSafeAfterMethodName(String baseName, List<Statement> existingStatements) {
         return existingStatements.stream()
-                .filter(it -> it instanceof J.MethodDeclaration)
+                .filter(J.MethodDeclaration.class::isInstance)
                 .map(it -> ((J.MethodDeclaration) it).getSimpleName())
                 .filter(s -> s.matches("^" + baseName + "(\\d+)?$"))
                 .max(Comparator.comparingInt(s -> s.equals(baseName) ? 0 : Integer.parseInt(s.substring(baseName.length()))))
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoWhenNewToMockito.java b/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoWhenNewToMockito.java
@@ -76,7 +76,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                             Cursor containingMethod = getCursor().dropParentUntil(x -> x instanceof J.MethodDeclaration);
                             Expression argument = select2.getArguments().get(0);
                             if (argument instanceof J.FieldAccess) {
-                                ArrayList<J.FieldAccess> listOfMocks = containingMethod.getMessage("POWERMOCKITO_WHEN_NEW_REPLACED", new ArrayList<J.FieldAccess>());
+                                List<J.FieldAccess> listOfMocks = containingMethod.getMessage("POWERMOCKITO_WHEN_NEW_REPLACED", new ArrayList<J.FieldAccess>());
                                 listOfMocks.add((J.FieldAccess) argument);
                                 containingMethod.putMessage("POWERMOCKITO_WHEN_NEW_REPLACED", listOfMocks);
                                 return null;
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/ReplaceMockitoTestExecutionListener.java b/src/main/java/org/openrewrite/java/testing/mockito/ReplaceMockitoTestExecutionListener.java
@@ -346,7 +346,7 @@ public boolean hasMockitoListener() {
         private boolean canTestExecutionListenerBeRemoved() {
             if (listener == null && listeners != null && listeners.getInitializer() != null &&
                 listeners.getInitializer().stream().allMatch(l -> isTypeReference(l, MOCKITO_TEST_EXECUTION_LISTENER))) {
-                return (getMigratedInheritListeners() == null && getMigratedMergeMode() != null);
+                return getMigratedInheritListeners() == null && getMigratedMergeMode() != null;
             }
             return false;
         }
diff --git a/src/main/resources/META-INF/rewrite/examples.yml b/src/main/resources/META-INF/rewrite/examples.yml
@@ -2374,6 +2374,66 @@ examples:
     language: java
 ---
 type: specs.openrewrite.org/v1beta/example
+recipeName: org.openrewrite.java.testing.junit.JUnit6BestPractices
+examples:
+- description: '`JUnit6BestPracticesTest#junit5ToJunit6`'
+  sources:
+  - before: |
+      import org.junit.jupiter.api.MethodOrderer;
+      import org.junit.jupiter.api.TestMethodOrder;
+      import org.junit.jupiter.api.Test;
+
+      @TestMethodOrder(MethodOrderer.Alphanumeric.class)
+      public class MyTest {
+          @Test
+          public void test1() {
+          }
+
+          @Test
+          public void test2() {
+          }
+      }
+    after: |
+      import org.junit.jupiter.api.MethodOrderer;
+      import org.junit.jupiter.api.TestMethodOrder;
+      import org.junit.jupiter.api.Test;
+
+      @TestMethodOrder(MethodOrderer.MethodName.class)
+      class MyTest {
+          @Test
+          void test1() {
+          }
+
+          @Test
+          void test2() {
+          }
+      }
+    language: java
+  - before: |
+      <project>
+          <modelVersion>4.0.0</modelVersion>
+          <groupId>com.example</groupId>
+          <artifactId>example</artifactId>
+          <version>1.0.0</version>
+          <properties>
+              <junit-jupiter.version>5.14.4</junit-jupiter.version>
+          </properties>
+          <dependencyManagement>
+              <dependencies>
+                  <dependency>
+                      <groupId>org.junit</groupId>
+                      <artifactId>junit-bom</artifactId>
+                      <version>${junit-jupiter.version}</version>
+                      <type>pom</type>
+                      <scope>import</scope>
+                  </dependency>
+              </dependencies>
+          </dependencyManagement>
+      </project>
+    path: pom.xml
+    language: xml
+---
+type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.junit5.AddHamcrestJUnitDependency
 examples:
 - description: '`AddHamcrestJUnitDependencyTest#shouldAddWhenUsingAssertThat`'
diff --git a/src/test/java/org/openrewrite/java/testing/assertj/SimplifyChainedAssertJAssertionsTest.java b/src/test/java/org/openrewrite/java/testing/assertj/SimplifyChainedAssertJAssertionsTest.java
@@ -312,7 +312,7 @@ void test() {
             String before = template.formatted(formattedAssertBefore);
 
             String finalArgument = "".equals(firstArg) ? secondArg : firstArg;
-            List<String> formattedArgs = new ArrayList<>(List.of(dedicatedAssertion, finalArgument));
+            var formattedArgs = new ArrayList<String>(List.of(dedicatedAssertion, finalArgument));
             if (!"".equals(firstArg) && !"".equals(secondArg)) {
                 formattedArgs.add(secondArg);
             }
diff --git a/src/test/java/org/openrewrite/java/testing/junit/JUnit6BestPracticesTest.java b/src/test/java/org/openrewrite/java/testing/junit/JUnit6BestPracticesTest.java
@@ -101,9 +101,8 @@ void test2() {
               </project>
               """,
             spec -> spec.after(actual -> {
-                assertThat(actual)
-                  .containsPattern("<junit-jupiter\\.version>6\\.\\d+\\.\\d+</junit-jupiter\\.version>");
-                return actual;
+                return assertThat(actual)
+                        .containsPattern("<junit-jupiter\\.version>6\\.\\d+\\.\\d+</junit-jupiter\\.version>").actual();
             })
           )
         );

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public boolean shouldAddDbRiderAnnotation() {`
`198`	`198`	`private boolean canTestExecutionListenerBeRemoved() {`
`199`	`199`	`if (listener == null && listeners != null && listeners.getInitializer() != null &&`
`200`	`200`	`listeners.getInitializer().stream().allMatch(listener -> isTypeReference(listener, DBRIDER_TEST_EXECUTION_LISTENER))) {`
`201`		`- return (getMigratedInheritListeners() == null && getMigratedMergeMode() != null);`
	`201`	`+ return getMigratedInheritListeners() == null && getMigratedMergeMode() != null;`
`202`	`202`	`}`
`203`	`203`	`return false;`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu`
`145`	`145`
`146`	`146`	`//we do not handle nested matchers`
`147`	`147`	`if (!(matcherInvocation.getArguments().get(0) instanceof J.Empty)) {`
`148`		`- if ((matcherInvocation.getArguments().get(0).getType()).toString().startsWith("org.hamcrest")) {`
	`148`	`+ if (matcherInvocation.getArguments().get(0).getType().toString().startsWith("org.hamcrest")) {`
`149`	`149`	`return mi;`
`150`	`150`	`}`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ private String getAnswerBody(J.MethodDeclaration md) {`
`340`	`340`	`new JavaIsoVisitor<Set<String>>() {`
`341`	`341`	`@Override`
`342`	`342`	`public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, Set<String> ctx) {`
`343`		`- Cursor scope = getCursor().dropParentUntil((is) -> is instanceof J.ClassDeclaration \|\| is instanceof J.Block \|\| is instanceof J.MethodDeclaration \|\| is instanceof J.ForLoop \|\| is instanceof J.ForEachLoop \|\| is instanceof J.ForLoop.Control \|\| is instanceof J.ForEachLoop.Control \|\| is instanceof J.Case \|\| is instanceof J.Try \|\| is instanceof J.Try.Resource \|\| is instanceof J.Try.Catch \|\| is instanceof J.MultiCatch \|\| is instanceof J.Lambda \|\| is instanceof JavaSourceFile);`
	`343`	`+ Cursor scope = getCursor().dropParentUntil(is -> is instanceof J.ClassDeclaration \|\| is instanceof J.Block \|\| is instanceof J.MethodDeclaration \|\| is instanceof J.ForLoop \|\| is instanceof J.ForEachLoop \|\| is instanceof J.ForLoop.Control \|\| is instanceof J.ForEachLoop.Control \|\| is instanceof J.Case \|\| is instanceof J.Try \|\| is instanceof J.Try.Resource \|\| is instanceof J.Try.Catch \|\| is instanceof J.MultiCatch \|\| is instanceof J.Lambda \|\| is instanceof JavaSourceFile);`
`344`	`344`	`if (!VariableReferences.findRhsReferences(scope.getValue(), variable.getName()).isEmpty()) {`
`345`	`345`	`ctx.add(variable.getSimpleName());`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ private boolean doTestParamsHaveCustomConverter(J.@Nullable MethodDeclaration me`
`176`	`176`	`return false;`
`177`	`177`	`}`
`178`	`178`	`return method.getParameters().stream()`
`179`		`- .filter(param -> param instanceof J.VariableDeclarations)`
	`179`	`+ .filter(J.VariableDeclarations.class::isInstance)`
`180`	`180`	`.map(J.VariableDeclarations.class::cast)`
`181`	`181`	`.anyMatch(v -> v.getLeadingAnnotations().stream().anyMatch(CONVERTER_MATCHER::matches));`
`182`	`182`	`}`
`@@ -370,7 +370,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu`
`370`	`370`	`method.getMethodType() != null &&`
`371`	`371`	`methodNames.contains(enclosingMethod.getSimpleName()) &&`
`372`	`372`	`method.getMethodType().getDeclaringType() == classType) {`
`373`		`- Cursor classCursor = getCursor().dropParentUntil(j -> j instanceof J.ClassDeclaration);`
	`373`	`+ Cursor classCursor = getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance);`
`374`	`374`	`classCursor.computeMessageIfAbsent(REFERENCED_METHODS, k -> new ArrayList<>()).add(method.getSimpleName());`
`375`	`375`	`}`
`376`	`376`	`return super.visitMethodInvocation(method, ctx);`