Merge pull request #48562 from geoand/#47649

Allow configuration of Vert.x's http2UpgradeMaxContentLength in REST Client

Author: geoand

extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java

@@ -276,6 +276,14 @@ public interface RestClientsConfig {
     @WithDefault("false")
     boolean http2();
 
+    /**
+     * Configures the HTTP/2 upgrade maximum length of the aggregated content in bytes.
+     * <p>
+     * This property is not applicable to the RESTEasy Client.
+     */
+    @ConfigDocDefault("64K")
+    Optional<MemorySize> http2UpgradeMaxContentLength();
+
     /**
      * Configures two different things:
      * <ul>
@@ -613,6 +621,14 @@ default Optional<String> uriReload() {
          */
         Optional<Boolean> http2();
 
+        /**
+         * Configures the HTTP/2 upgrade maximum length of the aggregated content in bytes.
+         * <p>
+         * This property is not applicable to the RESTEasy Client.
+         */
+        @ConfigDocDefault("64K")
+        Optional<MemorySize> http2UpgradeMaxContentLength();
+
         /**
          * Configures two different things:
          * <ul>

extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientBuilderImpl.java

@@ -538,6 +538,13 @@ public <T> T build(Class<T> aClass) throws IllegalStateException, RestClientDefi
             clientBuilder.http2(true);
         }
 
+        if (getConfiguration().hasProperty(QuarkusRestClientProperties.HTTP2_UPGRADE_MAX_CONTENT_LENGTH)) {
+            clientBuilder.http2UpgradeMaxContentLength(
+                    (int) getConfiguration().getProperty(QuarkusRestClientProperties.HTTP2_UPGRADE_MAX_CONTENT_LENGTH));
+        } else if (restClients.http2UpgradeMaxContentLength().isPresent()) {
+            clientBuilder.http2UpgradeMaxContentLength((int) restClients.http2UpgradeMaxContentLength().get().asLongValue());
+        }
+
         if (getConfiguration().hasProperty(QuarkusRestClientProperties.ALPN)) {
             clientBuilder.alpn((Boolean) getConfiguration().getProperty(QuarkusRestClientProperties.ALPN));
         } else if (restClients.alpn().isPresent()) {

extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilder.java

@@ -156,6 +156,13 @@ private void configureCustomProperties(QuarkusRestClientBuilder builder) {
         Boolean http2 = oneOf(restClientConfig.http2()).orElse(configRoot.http2());
         builder.property(QuarkusRestClientProperties.HTTP2, http2);
 
+        Optional<MemorySize> http2UpgradeMaxContentLength = oneOf(restClientConfig.http2UpgradeMaxContentLength(),
+                configRoot.http2UpgradeMaxContentLength());
+        if (http2UpgradeMaxContentLength.isPresent()) {
+            builder.property(QuarkusRestClientProperties.HTTP2_UPGRADE_MAX_CONTENT_LENGTH,
+                    (int) http2UpgradeMaxContentLength.get().asLongValue());
+        }
+
         Optional<Boolean> alpn = oneOf(restClientConfig.alpn(), configRoot.alpn());
         if (alpn.isPresent()) {
             builder.property(QuarkusRestClientProperties.ALPN, alpn.get());

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/QuarkusRestClientProperties.java

@@ -75,6 +75,11 @@ public class QuarkusRestClientProperties {
      */
     public static final String HTTP2 = "io.quarkus.rest.client.http2";
 
+    /**
+     * Configures the HTTP/2 upgrade maximum length of the aggregated content in bytes.
+     */
+    public static final String HTTP2_UPGRADE_MAX_CONTENT_LENGTH = "io.quarkus.rest.client.http2UpgradeMaxContentLength";
+
     /**
      * Set to true to explicitly use the Application-Layer Protocol Negotiation extension.
      */

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java

@@ -82,6 +82,7 @@ public class ClientBuilderImpl extends ClientBuilder {
     private String userAgent = RestClientRequestContext.DEFAULT_USER_AGENT_VALUE;
 
     private Boolean enableCompression;
+    private Integer http2UpgradeMaxContentLength;
 
     public ClientBuilderImpl() {
         configuration = new ConfigurationImpl(RuntimeType.CLIENT);
@@ -155,6 +156,11 @@ public ClientBuilder http2(boolean http2) {
         return this;
     }
 
+    public ClientBuilder http2UpgradeMaxContentLength(int http2UpgradeMaxContentLength) {
+        this.http2UpgradeMaxContentLength = http2UpgradeMaxContentLength;
+        return this;
+    }
+
     public ClientBuilder alpn(boolean alpn) {
         this.alpn = alpn;
         return this;
@@ -228,6 +234,10 @@ public ClientImpl build() {
             options.setAlpnVersions(List.of(HttpVersion.HTTP_2, HttpVersion.HTTP_1_1));
         }
 
+        if (http2UpgradeMaxContentLength != null) {
+            options.setHttp2UpgradeMaxContentLength(http2UpgradeMaxContentLength);
+        }
+
         if (tlsConfig != null) {
             populateSecurityOptionsFromTlsConfig(options);
         } else {