Merge pull request #187 from gsmet/recipes-3.13

Add a recipe to rewrite @QuarkusTestResource to @WithTestResource

recipes-tests/pom.xml

@@ -17,6 +17,8 @@
         <maven.compiler.release>17</maven.compiler.release>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <!-- Quarkus version used by the tests -->
+        <quarkus.version>3.13.0.CR1</quarkus.version>
         <!-- Camel quarkus version used by the tests -->
         <camel-quarkus.version>2.13.3</camel-quarkus.version>
         <!-- Http version used by the tests -->
@@ -25,13 +27,26 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom</artifactId>
+                <version>${quarkus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
                 <artifactId>camel-quarkus-bom</artifactId>
                 <version>${camel-quarkus.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- OpenRewrite depends on a Jackson version that still uses the old JAXB API -->
+             <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>2.3.3</version>
+             </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -132,6 +147,14 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Quarkus test dependencies -->
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-common</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Camel quarkus testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>

recipes-tests/src/test/java/io/quarkus/updates/core/CoreTestUtil.java

@@ -1,11 +1,9 @@
 package io.quarkus.updates.core;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
@@ -16,7 +14,6 @@
 import org.openrewrite.config.Environment;
 import org.openrewrite.config.YamlResourceLoader;
 import org.openrewrite.maven.UpgradeDependencyVersion;
-import org.openrewrite.maven.ChangePropertyValue;
 import org.openrewrite.test.RecipeSpec;
 
 public final class CoreTestUtil {

recipes-tests/src/test/java/io/quarkus/updates/core/CoreUpdate313Test.java

@@ -0,0 +1,110 @@
+package io.quarkus.updates.core;
+
+import static org.openrewrite.java.Assertions.java;
+
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
+
+public class CoreUpdate313Test implements RewriteTest {
+
+    @Override
+    public void defaults(RecipeSpec spec) {
+        CoreTestUtil.recipe(spec, Path.of("quarkus-updates", "core", "3.13.alpha1.yaml"))
+                .parser(JavaParser.fromJavaVersion()
+                        .classpath("quarkus-test-common")
+                        .logCompilationWarningsAndErrors(true))
+                .typeValidationOptions(TypeValidation.all());
+    }
+
+    @Test
+    void testWithTestResource() {
+        //language=java
+        rewriteRun(java(
+                """
+                    package io.quarkiverse.githubapp.test;
+
+                    import io.quarkus.test.common.QuarkusTestResource;
+
+                    @QuarkusTestResource
+                    public class GitHubAppTest {
+                    }
+                """,
+                """
+                    package io.quarkiverse.githubapp.test;
+
+                    import io.quarkus.test.common.WithTestResource;
+
+                    @WithTestResource(restrictToAnnotatedClass = false)
+                    public class GitHubAppTest {
+                    }
+                """));
+
+        //language=java
+        rewriteRun(java(
+            """
+                package io.quarkiverse.githubapp.test;
+
+                import io.quarkus.test.common.QuarkusTestResource;
+
+                @QuarkusTestResource(restrictToAnnotatedClass = false)
+                public class GitHubAppTest {
+                }
+            """,
+            """
+                package io.quarkiverse.githubapp.test;
+
+                import io.quarkus.test.common.WithTestResource;
+
+                @WithTestResource(restrictToAnnotatedClass = false)
+                public class GitHubAppTest {
+                }
+            """));
+
+        //language=java
+        rewriteRun(java(
+            """
+                package io.quarkiverse.githubapp.test;
+
+                import io.quarkus.test.common.QuarkusTestResource;
+
+                @QuarkusTestResource(restrictToAnnotatedClass = true)
+                class GitHubAppTest {
+                }
+            """,
+            """
+                package io.quarkiverse.githubapp.test;
+
+                import io.quarkus.test.common.WithTestResource;
+
+                @WithTestResource(restrictToAnnotatedClass = true)
+                class GitHubAppTest {
+                }
+            """));
+
+        //language=java
+        rewriteRun(java(
+            """
+                package io.quarkiverse.githubapp.test;
+
+                import io.quarkus.test.common.QuarkusTestResource;
+
+                @QuarkusTestResource(parallel = true)
+                class GitHubAppTest {
+                }
+            """,
+            """
+                package io.quarkiverse.githubapp.test;
+
+                import io.quarkus.test.common.WithTestResource;
+
+                @WithTestResource(restrictToAnnotatedClass = false, parallel = true)
+                class GitHubAppTest {
+                }
+            """));
+    }
+}

recipes/src/main/resources/quarkus-updates/core/3.13.alpha1.yaml

@@ -0,0 +1,30 @@
+#####
+# Sync JPA model gen version with the one from the BOM
+#####
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: io.quarkus.updates.core.quarkus313.SyncHibernateJpaModelgenVersionWithBOM
+recipeList:
+  - io.quarkus.updates.core.quarkus37.SyncMavenCompilerAnnotationProcessorVersion:
+      groupId: org.hibernate.orm
+      artifactId: hibernate-jpamodelgen
+#####
+# Replace @QuarkusTestResource with @WithTestResource while keeping the original behavior
+#####
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: io.quarkus.updates.core.quarkus313.WithTestResource
+recipeList:
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: io.quarkus.test.common.QuarkusTestResource
+      newFullyQualifiedTypeName: io.quarkus.test.common.WithTestResource
+---
+# The default for WithTestResource is different so if using the default value, let's enforce it
+type: specs.openrewrite.org/v1beta/recipe
+name: io.quarkus.updates.core.quarkus313.WithTestResourceRestrictToAnnotatedClassValue
+recipeList:
+  - org.openrewrite.java.AddOrUpdateAnnotationAttribute:
+      annotationType: io.quarkus.test.common.WithTestResource
+      attributeName: restrictToAnnotatedClass
+      attributeValue: false
+      addOnly: true