Merge pull request #47367 from jmartisk/smallrye-graphql-2.13

SmallRye GraphQL 2.13.0 and support for JSON/Object scalars

Author: geoand

bom/application/pom.xml

@@ -51,7 +51,7 @@
         <smallrye-health.version>4.2.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>4.0.9</smallrye-open-api.version>
-        <smallrye-graphql.version>2.12.2</smallrye-graphql.version>
+        <smallrye-graphql.version>2.13.0</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.9.0</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.6.1</smallrye-jwt.version>
         <smallrye-context-propagation.version>2.2.1</smallrye-context-propagation.version>

extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java

@@ -388,6 +388,10 @@ private void registerExtraScalarsInSchema(List<ExtraScalar> extraScalars) {
             switch (extraScalar) {
                 case UUID:
                     Scalars.addUuid();
+                case OBJECT:
+                    Scalars.addObject();
+                case JSON:
+                    Scalars.addJson();
             }
         }
     }

extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/JsonObjectScalarTest.java

@@ -0,0 +1,68 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import jakarta.json.JsonObject;
+
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * Support for the JSON graphql type represented in Java as jakarta.json.JsonObject
+ */
+public class JsonObjectScalarTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(ObjectApi.class)
+                    .addAsResource(new StringAsset("quarkus.smallrye-graphql.extra-scalars=json\n" +
+                            "quarkus.smallrye-graphql.schema-include-scalars=true"),
+                            "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testJsonObject() {
+        String query = getPayload("{ echo(input: { field1: 1, field2: \"2\"}) }");
+        RestAssured.given()
+                .body(query)
+                .contentType(MEDIATYPE_JSON)
+                .post("/graphql/")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body("data.echo.field1", equalTo(1))
+                .body("data.echo.field2", equalTo("2"));
+    }
+
+    @Test
+    public void testJsonSchemaDefinition() {
+        RestAssured.given()
+                .get("/graphql/schema.graphql")
+                .prettyPeek()
+                .then()
+                .assertThat()
+                .body(containsString("scalar JSON"))
+                .body(containsString("echo(input: JSON): JSON"))
+                .statusCode(200);
+    }
+
+    @GraphQLApi
+    public static class ObjectApi {
+
+        @Query
+        public JsonObject echo(JsonObject input) {
+            return input;
+        }
+
+    }
+
+}

extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ObjectScalarTest.java

@@ -0,0 +1,63 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ObjectScalarTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(ObjectApi.class)
+                    .addAsResource(new StringAsset("quarkus.smallrye-graphql.extra-scalars=object\n" +
+                            "quarkus.smallrye-graphql.schema-include-scalars=true"),
+                            "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testObject() {
+        String query = getPayload("{ echo(input: { field1: 1, field2: \"2\"}) }");
+        RestAssured.given()
+                .body(query)
+                .contentType(MEDIATYPE_JSON)
+                .post("/graphql/")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body("data.echo.field1", equalTo(1))
+                .body("data.echo.field2", equalTo("2"));
+    }
+
+    @Test
+    public void testObjectSchemaDefinition() {
+        RestAssured.given()
+                .get("/graphql/schema.graphql")
+                .prettyPeek()
+                .then()
+                .assertThat()
+                .body(containsString("scalar Object"))
+                .body(containsString("echo(input: Object): Object"))
+                .statusCode(200);
+    }
+
+    @GraphQLApi
+    public static class ObjectApi {
+
+        @Query
+        public Object echo(Object input) {
+            return input;
+        }
+
+    }
+
+}

extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/ExtraScalar.java

@@ -2,6 +2,19 @@
 
 public enum ExtraScalar {
 
-    UUID
+    /**
+     * The UUID GraphQL type, represented as a java.util.UUID
+     */
+    UUID,
+
+    /**
+     * The Object GraphQL type, represented as a general java.lang.Object
+     */
+    OBJECT,
+
+    /**
+     * The JSON GraphQL type, represented as a jakarta.json.JsonObject
+     */
+    JSON
 
 }

extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRecorder.java

@@ -53,6 +53,12 @@ private void registerExtraScalars(List<ExtraScalar> extraScalars) {
                 case UUID:
                     GraphQLScalarTypes.addUuid();
                     break;
+                case OBJECT:
+                    GraphQLScalarTypes.addObject();
+                    break;
+                case JSON:
+                    GraphQLScalarTypes.addJson();
+                    break;
             }
         }
     }