don't use TempDirNonFinal on method parameters (#484)

Fixes #483.
openrewrite · Feb 20, 2024 · 65053ab · 65053ab
1 parent 34937d4
commit 65053ab
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TempDirNonFinal.java b/src/main/java/org/openrewrite/java/testing/junit5/TempDirNonFinal.java
@@ -15,6 +15,7 @@
  */
 package org.openrewrite.java.testing.junit5;
 
+import org.openrewrite.Cursor;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
@@ -27,6 +28,7 @@
 import org.openrewrite.java.tree.J.Modifier.Type;
 
 import java.time.Duration;
+import java.util.Iterator;
 
 public class TempDirNonFinal extends Recipe {
 
@@ -53,7 +55,7 @@ private static class TempDirVisitor extends JavaIsoVisitor<ExecutionContext> {
         public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
             J.VariableDeclarations varDecls = super.visitVariableDeclarations(multiVariable, ctx);
             if (varDecls.getLeadingAnnotations().stream().anyMatch(TEMPDIR_ANNOTATION_MATCHER::matches)
-                    && varDecls.hasModifier(Type.Final)) {
+                    && varDecls.hasModifier(Type.Final) && isField(getCursor())) {
                 return maybeAutoFormat(varDecls, varDecls.withModifiers(ListUtils
                                 .map(varDecls.getModifiers(), modifier -> modifier.getType() == Type.Final ? null : modifier)),
                         ctx, getCursor().getParentOrThrow());
@@ -62,6 +64,21 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
         }
     }
 
+    // copied from org.openrewrite.java.search.FindFieldsOfType.isField(Cursor), should probably become part of the API
+    private static boolean isField(Cursor cursor) {
+        Iterator<Object> path = cursor.getPath();
+        while (path.hasNext()) {
+            Object o = path.next();
+            if (o instanceof J.MethodDeclaration) {
+                return false;
+            }
+            if (o instanceof J.ClassDeclaration) {
+                return true;
+            }
+        }
+        return true;
+    }
+
     @Override
     public Duration getEstimatedEffortPerOccurrence() {
         return Duration.ofMinutes(1);

diff --git a/src/test/java/org/openrewrite/java/testing/junit5/TempDirNonFinalTest.java b/src/test/java/org/openrewrite/java/testing/junit5/TempDirNonFinalTest.java
@@ -95,7 +95,7 @@ class MyTest {
     }
 
     @Test
-    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/241")
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/241, https://github.com/openrewrite/rewrite-testing-frameworks/issues/483")
     void tempDirFileParameter() {
         //language=java
         rewriteRun(
@@ -109,7 +109,7 @@ void tempDirFileParameter() {
               
               class MyTest {
                   @Test
-                  void fileTest(@TempDir File tempDir) {
+                  void fileTest(@TempDir final File tempDir) {
                   }
               }
               """