Merge pull request #29416 from gsmet/2.14.2-backports-2

2.14.2 backports 2
quarkusio · Nov 23, 2022 · 7eb24fe · 7eb24fe
2 parents 910dd6e + 8dac223
commit 7eb24fe
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 20 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -44,7 +44,7 @@
         <smallrye-health.version>3.3.0</smallrye-health.version>
         <smallrye-metrics.version>3.0.5</smallrye-metrics.version>
         <smallrye-open-api.version>2.3.1</smallrye-open-api.version>
-        <smallrye-graphql.version>1.8.2</smallrye-graphql.version>
+        <smallrye-graphql.version>1.8.3</smallrye-graphql.version>
         <smallrye-opentracing.version>2.1.1</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>5.5.0</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>3.5.4</smallrye-jwt.version>

diff --git a/...nsion-plugin/src/main/java/io/quarkus/extension/gradle/tasks/ExtensionDescriptorTask.java b/...nsion-plugin/src/main/java/io/quarkus/extension/gradle/tasks/ExtensionDescriptorTask.java
@@ -313,9 +313,10 @@ private void computeArtifactCoords(ObjectNode extObject) {
     private void computeSourceLocation(ObjectNode extObject) {
         Map<String, String> repo = ScmInfoProvider.getSourceRepo();
         if (repo != null) {
-            ObjectNode scm = extObject.putObject("scm");
+            ObjectNode metadata = getMetadataNode(extObject);
+
             for (Map.Entry<String, String> e : repo.entrySet()) {
-                scm.put(e.getKey(), e.getValue());
+                metadata.put("scm-" + e.getKey(), e.getValue());
 
             }
         }

diff --git a/...n-plugin/src/test/java/io/quarkus/extension/gradle/tasks/ExtensionDescriptorTaskTest.java b/...n-plugin/src/test/java/io/quarkus/extension/gradle/tasks/ExtensionDescriptorTaskTest.java
@@ -200,10 +200,9 @@ public void shouldGenerateScmInformation() throws IOException {
         File extensionDescriptorFile = new File(testProjectDir, "build/resources/main/META-INF/quarkus-extension.yaml");
         assertThat(extensionDescriptorFile).exists();
         ObjectNode extensionDescriptor = TestUtils.readExtensionFile(extensionDescriptorFile.toPath());
-        assertThat(extensionDescriptor.get("scm")).isNotNull();
-        assertThat(extensionDescriptor.get("scm").get("url")).isNotNull();
-        assertThat(extensionDescriptor.get("scm").get("url").asText())
-                .as("Check source location %s", extensionDescriptor.get("scm"))
+        assertThat(extensionDescriptor.get("metadata").get("scm-url")).isNotNull();
+        assertThat(extensionDescriptor.get("metadata").get("scm-url").asText())
+                .as("Check source location %s", extensionDescriptor.get("scm-url"))
                 .isEqualTo("https://github.com/some/repo");
     }
 

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -1268,7 +1268,7 @@ private void addQuarkusDevModeDeps(MavenDevModeLauncher.Builder builder, Applica
             final List<Exclusion> exclusions;
             if (!d.getExclusions().isEmpty()) {
                 exclusions = new ArrayList<>(d.getExclusions().size());
-                d.getExclusions().forEach(e -> exclusions.add(new Exclusion(e.getGroupId(), e.getArtifactId(), null, null)));
+                d.getExclusions().forEach(e -> exclusions.add(new Exclusion(e.getGroupId(), e.getArtifactId(), "*", "*")));
             } else {
                 exclusions = List.of();
             }

diff --git a/extensions/security-jpa/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/security-jpa/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -7,7 +7,7 @@ metadata:
   - "jpa"
   - "orm"
   - "panache"
-  guide: "https://quarkus.io/guides/security-jpa"
+  guide: "https://quarkus.io/guides/security-getting-started"
   categories:
   - "security"
   status: "stable"

diff --git a/...in/java/io/quarkus/smallrye/graphql/client/deployment/SmallRyeGraphQLClientProcessor.java b/...in/java/io/quarkus/smallrye/graphql/client/deployment/SmallRyeGraphQLClientProcessor.java
@@ -38,6 +38,7 @@
 import io.quarkus.smallrye.graphql.client.runtime.GraphQLClientSupport;
 import io.quarkus.smallrye.graphql.client.runtime.GraphQLClientsConfig;
 import io.quarkus.smallrye.graphql.client.runtime.SmallRyeGraphQLClientRecorder;
+import io.quarkus.vertx.core.deployment.CoreVertxBuildItem;
 
 public class SmallRyeGraphQLClientProcessor {
 
@@ -205,4 +206,11 @@ ServiceProviderBuildItem overrideErrorMessageProvider() {
         return ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.impl.ErrorMessageProvider");
     }
 
+    @BuildStep
+    @Record(RUNTIME_INIT)
+    void setGlobalVertxInstance(CoreVertxBuildItem vertxBuildItem,
+            SmallRyeGraphQLClientRecorder recorder) {
+        recorder.setGlobalVertxInstance(vertxBuildItem.getVertx());
+    }
+
 }
diff --git a/...c/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java b/...c/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java
@@ -10,6 +10,8 @@
 import io.quarkus.runtime.annotations.Recorder;
 import io.smallrye.graphql.client.impl.GraphQLClientsConfiguration;
 import io.smallrye.graphql.client.typesafe.api.TypesafeGraphQLClientBuilder;
+import io.smallrye.graphql.client.vertx.VertxManager;
+import io.vertx.core.Vertx;
 
 @Recorder
 public class SmallRyeGraphQLClientRecorder {
@@ -48,4 +50,8 @@ public void initializeConfigurationMergerBean() {
         merger.nothing();
     }
 
+    public void setGlobalVertxInstance(Supplier<Vertx> vertx) {
+        VertxManager.setFromGlobal(vertx.get());
+    }
+
 }
diff --git a/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -660,10 +660,9 @@ public boolean visitLeave(DependencyNode node) {
     private void addSource(ObjectNode extObject) throws MojoExecutionException {
         Map<String, String> repo = getSourceRepo();
         if (repo != null) {
-            ObjectNode scm = extObject.putObject("scm");
+            ObjectNode metadata = getMetadataNode(extObject);
             for (Map.Entry<String, String> e : repo.entrySet()) {
-                scm.put(e.getKey(), e.getValue());
-
+                metadata.put("scm-" + e.getKey(), e.getValue());
             }
         }
     }

diff --git a/...ojects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/...ojects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -676,9 +676,10 @@ public boolean visitLeave(DependencyNode node) {
     private void addSource(ObjectNode extObject) throws MojoExecutionException {
         Map<String, String> repo = ScmInfoProvider.getSourceRepo();
         if (repo != null) {
-            ObjectNode scm = extObject.putObject("scm");
+            ObjectNode metadata = getMetadataNode(extObject);
             for (Map.Entry<String, String> e : repo.entrySet()) {
-                scm.put(e.getKey(), e.getValue());
+                // Tools may not be able to handle nesting in metadata, so do fake-nesting
+                metadata.put("scm-" + e.getKey(), e.getValue());
 
             }
         }

diff --git a/...ts/extension-maven-plugin/src/test/java/io/quarkus/maven/ExtensionDescriptorMojoTest.java b/...ts/extension-maven-plugin/src/test/java/io/quarkus/maven/ExtensionDescriptorMojoTest.java
@@ -100,8 +100,7 @@ public void shouldCreateMetadata()
         // From maven this property should be set, running in an IDE it won't be unless specially configured
         if (System.getenv("GITHUB_REPOSITORY") != null) {
             // Lazily test that the scm is there but is an object
-            assertYamlContainsObject(fileContents, "scm");
-            assertYamlContains(fileContents, "url", "https://github.com/some/repo");
+            assertYamlContains(fileContents, "scm-url", "https://github.com/some/repo");
         }
 
     }

diff --git a/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java b/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java
@@ -99,9 +99,6 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
                 responseBuilder = fromResponse(existing);
                 responseBuilder.entity(genericEntity.getEntity());
             } else {
-                // TCK says to use the entity type as generic type if we return a response
-                if (existing.hasEntity() && (existing.getEntity() != null))
-                    requestContext.setGenericReturnType(existing.getEntity().getClass());
                 //TODO: super inefficient
                 responseBuilder = fromResponse(existing);
                 if ((result instanceof RestResponseImpl)) {

diff --git a/...ation-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt b/...ation-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt
@@ -4,6 +4,7 @@ import io.quarkus.it.kotser.model.Person
 import io.quarkus.it.kotser.model.Person2
 import io.quarkus.runtime.annotations.RegisterForReflection
 import kotlinx.coroutines.flow.flowOf
+import org.jboss.resteasy.reactive.RestResponse
 import java.lang.reflect.Method
 import javax.ws.rs.Consumes
 import javax.ws.rs.GET
@@ -28,6 +29,16 @@ class GreetingResource {
         return Person("Jim Halpert")
     }
 
+    @Path("restResponse")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    fun restResponse() = RestResponse.ok(Person("Jim Halpert"))
+
+    @Path("restResponseList")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    fun restResponseList() = RestResponse.ok(mutableListOf(Person("Jim Halpert")))
+
     @Path("unknownType")
     @GET
     @Produces(MediaType.APPLICATION_JSON)

diff --git a/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt b/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt
@@ -32,6 +32,26 @@ open class ResourceTest {
         }
     }
 
+    @Test
+    fun testRestResponse() {
+        When {
+            get("/restResponse")
+        } Then {
+            statusCode(200)
+            body(`is`("""{"name":"Jim Halpert","defaulted":"hi there!"}"""))
+        }
+    }
+
+    @Test
+    fun testRestResponseList() {
+        When {
+            get("/restResponseList")
+        } Then {
+            statusCode(200)
+            body(`is`("""[{"name":"Jim Halpert","defaulted":"hi there!"}]"""))
+        }
+    }
+
     @Test
     fun testGetUnknownType() {
         When {

diff --git a/jakarta/rewrite.yml b/jakarta/rewrite.yml
@@ -573,7 +573,7 @@ recipeList:
       newValue: 6.0.0-RC4
   - org.openrewrite.maven.ChangePropertyValue:
       key: smallrye-graphql.version
-      newValue: 2.0.0.RC12
+      newValue: 2.0.0.RC13
   - org.openrewrite.maven.ChangePropertyValue:
       key: smallrye-health.version
       newValue: 4.0.0