Merge branch 'DevfestNantes25'

Author: jtama

toxic-library-remover/pom.xml

@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-recipe-bom</artifactId>
-                <version>3.14.1</version>
+                <version>3.16.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -56,6 +56,12 @@
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openrewrite.recipe</groupId>
@@ -76,7 +82,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_core</artifactId>
-            <version>2.37.0</version>
+            <version>2.42.0</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
@@ -121,7 +127,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <release>21</release>
+                    <release>25</release>
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>

toxic-library-remover/src/main/java/com/github/jtama/openrewrite/ExtractInterface.java

@@ -28,6 +28,11 @@ public String getDescription() {
         return "Replace any usage of `Timer.logStart()` and `Timer.logEnd()` methods by `@Timed` annotation.";
     }
 
+    @Override
+    public boolean causesAnotherCycle() {
+        return true;
+    }
+
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new Preconditions.Check(new UsesType<>("com.github.jtama.toxic.Timer", true),
@@ -38,7 +43,7 @@ private static class ReplaceCompareVisitor extends JavaIsoVisitor<ExecutionConte
 
         private final MethodMatcher logStartInvocaMatcher = new MethodMatcher("com.github.jtama.toxic.Timer logStart()");
         private final MethodMatcher logEndInvocaMatcher = new MethodMatcher("com.github.jtama.toxic.Timer logEnd()");
-        private final AnnotationMatcher logStartMatcher = new AnnotationMatcher("@io.micrometer.core.annotation.Timed");
+        private final AnnotationMatcher timedMatcher = new AnnotationMatcher("@io.micrometer.core.annotation.Timed");
         private final JavaTemplate annotationTemplate = JavaTemplate.builder("@Timed")
                 .imports("io.micrometer.core.annotation.Timed")
                 .javaParser(JavaParser.fromJavaVersion().classpath(JavaParser.runtimeClasspath()))
@@ -54,7 +59,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
             Cursor cursor = getCursor();
             if (cursor.getMessage("appendAnnotation", false)) {
                 if (md.getLeadingAnnotations().stream()
-                        .noneMatch(logStartMatcher::matches)) {
+                        .noneMatch(timedMatcher::matches)) {
                     maybeAddImport("io.micrometer.core.annotation.Timed");
                     md = annotationTemplate.apply(cursor, method.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName)));
                 }

toxic-library-remover/src/main/java/com/github/jtama/openrewrite/RemoveLogStartInvocations.java

@@ -22,8 +22,7 @@ recipeList:
   - org.openrewrite.maven.RemoveProperty:
       propertyName: toxic.version
   - com.github.jtama.openrewrite.ExtractInterface:
-      sourceModule: .
-      targetModule: .
+      targetAnnotation: com.github.jtama.toxic.LearnToFly
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: com.github.jtama.openrewrite.VousAllezVoirCeQueVousAllezVoir

toxic-library-remover/src/main/resources/META-INF/rewrite/rewrite.yml

@@ -12,7 +12,7 @@ class ExtractInterfaceTest implements RewriteTest {
 
     @Override
     public void defaults(RecipeSpec spec) {
-        spec.recipe(new ExtractInterface("bar", "fighter"))
+        spec.recipe(new ExtractInterface("com.github.jtama.toxic.LearnToFly"))
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
             .classpath("toxic-library"))
@@ -88,8 +88,7 @@ public int compareTo(Integer o) {
                       return 0;
                   }
               }
-              """,
-            spec -> spec.path("foo/bar/src/main/java/tutu/ManualGearCar.java")),
+              """),
           //language=java
           java(null, """
               package tutu;
@@ -105,8 +104,7 @@ public interface IManualGearCar extends Comparable<Integer> {
 
                   @Override int compareTo(Integer o);
               }
-              """,
-            spec -> spec.path("foo/fighter/src/main/java/tutu/IManualGearCar.java")
+              """
           )
         );
     }
@@ -165,8 +163,7 @@ public void doSomething(String param) {
                       // To something
                   }
               }
-              """,
-            spec -> spec.path("foo/bar/src/main/java/tutu/ManualGearCar.java")),
+              """),
           //language=java
           java(null, """
               package tutu;
@@ -180,8 +177,7 @@ public interface IManualGearCar {
               
                   void doSomething(String param);
               }
-              """,
-            spec -> spec.path("foo/fighter/src/main/java/tutu/IManualGearCar.java")
+              """
           )
         );
     }

toxic-library-remover/src/test/java/com/github/jtama/openrewrite/ExtractInterfaceTest.java

@@ -1,4 +1,11 @@
-[source%linenums, bash]
+[source%linenums, console]
+----
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run \
+-Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-testing-frameworks:RELEASE \
+-Drewrite.activeRecipes=org.openrewrite.java.testing.junit5.JUnit4to5Migration
+----
+
+[source%linenums, console]
 ----
 mvn -U org.openrewrite.maven:rewrite-maven-plugin:run \
 -Drewrite.recipeArtifactCoordinates=com.github.jtama:toxic-library-remover:1.0.1-SNAPSHOT \

toxic-library-user/README.adoc

@@ -9,8 +9,8 @@
     <version>1.0.1-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <quarkus.version>3.17.3</quarkus.version>

toxic-library-user/pom.xml

@@ -9,8 +9,8 @@
     <version>19.666.45-RC18-FINAL</version>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>