Merge pull request #31809 from mskacelik/smallrye-graphQL-2.1.2

Update SmallRye GraphQL to 2.1.2

Author: jmartisk

bom/application/pom.xml

@@ -59,7 +59,7 @@
         <smallrye-health.version>4.0.1</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.3.0</smallrye-open-api.version>
-        <smallrye-graphql.version>2.1.1</smallrye-graphql.version>
+        <smallrye-graphql.version>2.1.2</smallrye-graphql.version>
         <smallrye-opentracing.version>3.0.3</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>6.2.1</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.2.0</smallrye-jwt.version>

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

@@ -64,9 +64,16 @@ void setupServiceProviders(BuildProducer<ServiceProviderBuildItem> services) {
         services.produce(ServiceProviderBuildItem
                 .allProvidersFromClassPath("io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder"));
         services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.Argument"));
+        services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.Directive"));
+        services.produce(
+                ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.DirectiveArgument"));
         services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.Document"));
         services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.Enum"));
         services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.Field"));
+        services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.Fragment"));
+        services.produce(
+                ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.FragmentReference"));
+        services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.InlineFragment"));
         services.produce(ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.InputObject"));
         services.produce(
                 ServiceProviderBuildItem.allProvidersFromClassPath("io.smallrye.graphql.client.core.InputObjectField"));

integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/GraphQLClientTester.java

@@ -2,8 +2,11 @@
 
 import static io.smallrye.graphql.client.core.Argument.arg;
 import static io.smallrye.graphql.client.core.Argument.args;
+import static io.smallrye.graphql.client.core.Directive.directive;
+import static io.smallrye.graphql.client.core.DirectiveArgument.directiveArg;
 import static io.smallrye.graphql.client.core.Document.document;
 import static io.smallrye.graphql.client.core.Field.field;
+import static io.smallrye.graphql.client.core.Field.fieldWithDirectives;
 import static io.smallrye.graphql.client.core.Operation.operation;
 
 import java.util.List;
@@ -151,6 +154,24 @@ public void dynamicSubscription(@PathParam("url") String url) throws Exception {
         }
     }
 
+    @GET
+    @Path("/dynamic-directive/{url}")
+    public void dynamicDirective(@PathParam("url") String url) throws Exception {
+        try (DynamicGraphQLClient client = DynamicGraphQLClientBuilder.newBuilder().url(url.toString() + "/graphql").build()) {
+            Document query = document(
+                    operation(OperationType.QUERY,
+                            fieldWithDirectives("piNumber",
+                                    directive("skip", directiveArg("if", false)))));
+            Response response = client.executeSync(query);
+
+            final String expectedResult = "3.14159";
+            final String result = response.getData().getString("piNumber");
+            if (!result.equals(expectedResult)) {
+                throw new RuntimeException("Unexpected response: " + response);
+            }
+        }
+    }
+
     @GraphQLClient("some-key")
     Instance<DynamicGraphQLClient> autowiredDynamicClient;
 

integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/LuckyNumbersResource.java

@@ -9,8 +9,10 @@
 import org.eclipse.microprofile.graphql.NonNull;
 import org.eclipse.microprofile.graphql.Query;
 
+import graphql.execution.directives.QueryDirectives;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.smallrye.graphql.api.Subscription;
+import io.smallrye.graphql.execution.context.SmallRyeContext;
 import io.smallrye.mutiny.Multi;
 
 @GraphQLApi
@@ -21,6 +23,9 @@ public class LuckyNumbersResource {
     @Inject
     CurrentVertxRequest request;
 
+    @Inject
+    SmallRyeContext context;
+
     @Query(value = "get")
     public Integer luckyNumber() {
         return luckyNumber;
@@ -47,4 +52,14 @@ public String returnHeader(String key) {
         return request.getCurrent().request().getHeader(key);
     }
 
+    @Query
+    public String piNumber() {
+        QueryDirectives directives = context.getDataFetchingEnvironment().getQueryDirectives();
+        if (directives.getImmediateAppliedDirective("skip").isEmpty()) {
+            throw new IllegalArgumentException("Directive 'skip' was not found in the query (on the server side).");
+        }
+
+        return "3.14159";
+    }
+
 }

integration-tests/smallrye-graphql-client/src/test/java/io/quarkus/it/smallrye/graphql/client/DynamicClientTest.java

@@ -56,4 +56,13 @@ public void testDynamicClientAutowiredUrl() throws Exception {
                 .statusCode(204);
     }
 
+    @Test
+    public void testDynamicClientDirective() throws Exception {
+        when()
+                .get("/dynamic-directive/" + url.toString())
+                .then()
+                .log().everything()
+                .statusCode(204);
+    }
+
 }