Merge pull request #24532 from jmartisk/srgql-1.4.4

SmallRye GraphQL 1.4.4
quarkusio · Mar 25, 2022 · 9870143 · 9870143
2 parents de9ded0 + 48e2ef1
commit 9870143
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -43,7 +43,7 @@
         <smallrye-health.version>3.2.1</smallrye-health.version>
         <smallrye-metrics.version>3.0.4</smallrye-metrics.version>
         <smallrye-open-api.version>2.1.22</smallrye-open-api.version>
-        <smallrye-graphql.version>1.4.3</smallrye-graphql.version>
+        <smallrye-graphql.version>1.4.4</smallrye-graphql.version>
         <smallrye-opentracing.version>2.1.0</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>5.3.1</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>3.3.3</smallrye-jwt.version>

diff --git a/...runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfig.java b/...runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfig.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalInt;
 
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
@@ -33,6 +34,20 @@ public class GraphQLClientConfig {
     @ConfigItem(defaultValue = "graphql-transport-ws")
     public Optional<List<String>> subprotocols;
 
+    /**
+     * If true, then queries and mutations will run over the websocket transport rather than pure HTTP.
+     * Off by default, because it has higher overhead.
+     */
+    @ConfigItem
+    public Optional<Boolean> executeSingleResultOperationsOverWebsocket;
+
+    /**
+     * Maximum time in milliseconds that will be allowed to wait for the server to acknowledge a websocket connection
+     * (send a subprotocol-specific ACK message).
+     */
+    @ConfigItem
+    public OptionalInt websocketInitializationTimeout;
+
     /**
      * The trust store location. Can point to either a classpath resource or a file.
      */
@@ -79,7 +94,7 @@ public class GraphQLClientConfig {
      * Port number of the proxy to use.
      */
     @ConfigItem
-    public Optional<Integer> proxyPort;
+    public OptionalInt proxyPort;
 
     /**
      * Username for the proxy to use.
@@ -97,6 +112,6 @@ public class GraphQLClientConfig {
      * Maximum number of redirects to follow.
      */
     @ConfigItem
-    public Optional<Integer> maxRedirects;
+    public OptionalInt maxRedirects;
 
 }
diff --git a/...java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java b/...java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java
@@ -74,6 +74,9 @@ private GraphQLClientConfiguration toSmallRyeNativeConfiguration(GraphQLClientCo
         quarkusConfig.proxyUsername.ifPresent(transformed::setProxyUsername);
         quarkusConfig.proxyPassword.ifPresent(transformed::setProxyPassword);
         quarkusConfig.maxRedirects.ifPresent(transformed::setMaxRedirects);
+        quarkusConfig.executeSingleResultOperationsOverWebsocket
+                .ifPresent(transformed::setExecuteSingleOperationsOverWebsocket);
+        quarkusConfig.websocketInitializationTimeout.ifPresent(transformed::setWebsocketInitializationTimeout);
         return transformed;
     }