Context free SimplifyAssertJAssertion (#570)

timtebeek · knutwannheden · web-flow · commit b1e8bf08db18 · 2024-08-12T09:59:42.000+02:00
* Context free SimplifyAssertJAssertion

* Apply suggestions from code review

Co-authored-by: Knut Wannheden &lt;knut@moderne.io&gt;

---------

Co-authored-by: Knut Wannheden &lt;knut@moderne.io&gt;
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/SimplifyAssertJAssertion.java b/src/main/java/org/openrewrite/java/testing/assertj/SimplifyAssertJAssertion.java
@@ -95,11 +95,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInvocat
             }
 
             // Assume zero argument replacement method
-            return JavaTemplate.builder(dedicatedAssertion + "()")
-                    .contextSensitive()
+            return JavaTemplate.builder("#{any()}." + dedicatedAssertion + "()")
                     .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))
                     .build()
-                    .apply(getCursor(), mi.getCoordinates().replaceMethod());
+                    .apply(getCursor(), mi.getCoordinates().replace(), mi.getSelect());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInvocat`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// Assume zero argument replacement method`
`98`		`- return JavaTemplate.builder(dedicatedAssertion + "()")`
`99`		`- .contextSensitive()`
	`98`	`+ return JavaTemplate.builder("#{any()}." + dedicatedAssertion + "()")`
`100`	`99`	`.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3.24"))`
`101`	`100`	`.build()`
`102`		`- .apply(getCursor(), mi.getCoordinates().replaceMethod());`
	`101`	`+ .apply(getCursor(), mi.getCoordinates().replace(), mi.getSelect());`
`103`	`102`	`}`
`104`	`103`	`}`
`105`	`104`	`}`