Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configuration options to configure limits for Multipart Payloads in Rest Clients #46547

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add configuration options to configure limits for Multipart Payloads in Rest Clients #46547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...t-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,19 @@ interface RestClientMultipartConfig {
*/
@Deprecated
OptionalInt maxChunkSize();

/**
* The threshold to use for the amount of data to store in memory for entities, up to {@code Long.MAX_VALUE}. See
* {@code dev.resteasy.entity.memory.threshold} in RESTEasy documentation.
*/
Optional<MemorySize> memoryThreshold();

/**
* The threshold to use for the amount of data that can be stored in a file for entities. If the threshold is reached an
* IllegalStateException will be thrown. A value of -1 means no limit, up to {@code Long.MAX_VALUE}. See
* {@code dev.resteasy.entity.file.threshold } in RESTEasy documentation.
*/
Optional<MemorySize> fileThreshold();
}

interface RestClientConfig {
Expand Down
5 changes: 5 additions & 0 deletions ...lient-config/runtime/src/test/java/io/quarkus/restclient/config/RestClientConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.quarkus.restclient.config.key.SharedThreeConfigKeyRestClient;
import io.quarkus.restclient.config.key.SharedTwoConfigKeyRestClient;
import io.quarkus.runtime.configuration.ConfigUtils;
import io.quarkus.runtime.configuration.MemorySizeConverter;
import io.smallrye.config.SmallRyeConfig;
import io.smallrye.config.SmallRyeConfigBuilder;
import io.smallrye.config.SmallRyeConfigBuilderCustomizer;
Expand Down Expand Up @@ -371,5 +372,9 @@ private void verifyConfig(RestClientConfig config) {
assertThat(config.connectionPoolSize().getAsInt()).isEqualTo(10);
assertTrue(config.maxChunkSize().isPresent());
assertThat(config.maxChunkSize().get().asBigInteger()).isEqualTo(BigInteger.valueOf(1024));
assertThat(config.multipart().fileThreshold().get().asBigInteger())
.isEqualTo(new MemorySizeConverter().convert("5M").asBigInteger());
assertThat(config.multipart().memoryThreshold().get().asBigInteger())
.isEqualTo(new MemorySizeConverter().convert("10M").asBigInteger());
}
}
4 changes: 4 additions & 0 deletions ...ons/resteasy-classic/rest-client-config/runtime/src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ quarkus.rest-client."io.quarkus.restclient.config.FullNameRestClient".hostname-v
quarkus.rest-client."io.quarkus.restclient.config.FullNameRestClient".connection-ttl=30000
quarkus.rest-client."io.quarkus.restclient.config.FullNameRestClient".connection-pool-size=10
quarkus.rest-client."io.quarkus.restclient.config.FullNameRestClient".max-chunk-size=1024
quarkus.rest-client."io.quarkus.restclient.config.FullNameRestClient".multipart.file-threshold=5M
quarkus.rest-client."io.quarkus.restclient.config.FullNameRestClient".multipart.memory-threshold=10M

quarkus.rest-client.key.removes-trailing-slash=false
quarkus.rest-client.key.url=http://localhost:8080
Expand All @@ -29,6 +31,8 @@ quarkus.rest-client.key.hostname-verifier=io.quarkus.restclient.configuration.My
quarkus.rest-client.key.connection-ttl=30000
quarkus.rest-client.key.connection-pool-size=10
quarkus.rest-client.key.max-chunk-size=1024
quarkus.rest-client.key.multipart.file-threshold=5M
quarkus.rest-client.key.multipart.memory-threshold=10M

quarkus.rest-client."io.quarkus.restclient.config.MPRestClient".url=http://localhost:8080
io.quarkus.restclient.config.MPRestClient/mp-rest/url=http://localhost:8081
Expand Down
5 changes: 5 additions & 0 deletions ...deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import io.quarkus.arc.Arc;
import io.quarkus.restclient.config.RestClientsConfig;
import io.quarkus.runtime.configuration.MemorySizeConverter;
import io.quarkus.test.QuarkusUnitTest;

public class GlobalConfigurationTest {
Expand Down Expand Up @@ -79,5 +80,9 @@
assertThat(configRoot.keyStore().get()).isEqualTo("/path");
assertThat(configRoot.keyStorePassword().get()).isEqualTo("password");
assertThat(configRoot.keyStoreType().get()).isEqualTo("JKS");
assertThat(configRoot.multipart().fileThreshold().get().asBigInteger())

Check failure on line 83 in extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 17 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.restclient.configuration.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:83)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.restclient.configuration.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:83)
	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)

Check failure on line 83 in extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 21 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.restclient.configuration.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:83)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.restclient.configuration.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:83)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)

Check failure on line 83 in extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 17 Windows 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.restclient.configuration.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:83)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.restclient.configuration.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:83)
	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
.isEqualTo(new MemorySizeConverter().convert("5M").asBigInteger());
assertThat(configRoot.multipart().memoryThreshold().get().asBigInteger())
.isEqualTo(new MemorySizeConverter().convert("10M").asBigInteger());
}
}
15 changes: 15 additions & 0 deletions ...c/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import io.quarkus.restclient.NoopHostnameVerifier;
import io.quarkus.restclient.config.RestClientsConfig;
import io.quarkus.restclient.config.RestClientsConfig.RestClientConfig;
import io.quarkus.runtime.configuration.MemorySize;
import io.smallrye.config.SmallRyeConfig;

public class RestClientBase {
Expand Down Expand Up @@ -93,6 +94,20 @@ protected void configureCustomProperties(RestClientBuilder builder) {
builder.property("resteasy.connectionTTL",
Arrays.asList(connectionTTL.getAsInt(), TimeUnit.MILLISECONDS));
}

Optional<MemorySize> fileThreshold = oneOf(restClientConfig.multipart().fileThreshold(),
configRoot.multipart().fileThreshold());
if (fileThreshold.isPresent()) {
builder.property("dev.resteasy.entity.file.threshold",
fileThreshold.get().asLongValue());
}

Optional<MemorySize> memoryThreshold = oneOf(restClientConfig.multipart().memoryThreshold(),
configRoot.multipart().memoryThreshold());
if (memoryThreshold.isPresent()) {
builder.property("dev.resteasy.entity.memory.threshold",
memoryThreshold.get().asLongValue());
}
}

protected void configureProxy(RestClientBuilder builder) {
Expand Down
5 changes: 5 additions & 0 deletions ...st-client/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.quarkus.arc.Arc;
import io.quarkus.rest.client.reactive.configuration.EchoResource;
import io.quarkus.restclient.config.RestClientsConfig;
import io.quarkus.runtime.configuration.MemorySizeConverter;
import io.quarkus.test.QuarkusUnitTest;

class ConfigurationTest {
Expand Down Expand Up @@ -55,7 +56,7 @@
@Test
void checkClientSpecificConfigs() {
RestClientsConfig.RestClientConfig clientConfig = restClientsConfig.getClient(HelloClientWithBaseUri.class);
verifyClientConfig(clientConfig, true);

Check failure on line 59 in extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 17 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.ConfigurationTest.verifyClientConfig(ConfigurationTest.java:95)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.ConfigurationTest.verifyClientConfig(ConfigurationTest.java:95)
	at io.quarkus.rest.client.reactive.ConfigurationTest.checkClientSpecificConfigs(ConfigurationTest.java:59)
	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)

Check failure on line 59 in extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 21 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.ConfigurationTest.verifyClientConfig(ConfigurationTest.java:95)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.ConfigurationTest.verifyClientConfig(ConfigurationTest.java:95)
	at io.quarkus.rest.client.reactive.ConfigurationTest.checkClientSpecificConfigs(ConfigurationTest.java:59)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)

Check failure on line 59 in extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 17 Windows 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.ConfigurationTest.verifyClientConfig(ConfigurationTest.java:95)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.ConfigurationTest.verifyClientConfig(ConfigurationTest.java:95)
	at io.quarkus.rest.client.reactive.ConfigurationTest.checkClientSpecificConfigs(ConfigurationTest.java:59)
	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)

clientConfig = restClientsConfig.getClient(ConfigKeyClient.class);
verifyClientConfig(clientConfig, true);
Expand Down Expand Up @@ -91,6 +92,10 @@
assertThat(clientConfig.followRedirects().get()).isEqualTo(true);
assertTrue(clientConfig.queryParamStyle().isPresent());
assertThat(clientConfig.queryParamStyle().get()).isEqualTo(QueryParamStyle.COMMA_SEPARATED);
assertThat(clientConfig.multipart().fileThreshold().get().asBigInteger())
.isEqualTo(new MemorySizeConverter().convert("5M").asBigInteger());
assertThat(clientConfig.multipart().memoryThreshold().get().asBigInteger())
.isEqualTo(new MemorySizeConverter().convert("10M").asBigInteger());

if (checkExtraProperties) {
assertTrue(clientConfig.connectionTTL().isPresent());
Expand Down
5 changes: 5 additions & 0 deletions ...ent/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import io.quarkus.arc.Arc;
import io.quarkus.rest.client.reactive.configuration.EchoResource;
import io.quarkus.restclient.config.RestClientsConfig;
import io.quarkus.runtime.configuration.MemorySizeConverter;
import io.quarkus.test.QuarkusUnitTest;

public class GlobalConfigurationTest {
Expand Down Expand Up @@ -78,5 +79,9 @@
assertThat(configRoot.keyStore().get()).isEqualTo("/path");
assertThat(configRoot.keyStorePassword().get()).isEqualTo("password");
assertThat(configRoot.keyStoreType().get()).isEqualTo("JKS");
assertThat(configRoot.multipart().fileThreshold().get().asBigInteger())

Check failure on line 82 in extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 17 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:82)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:82)
	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)

Check failure on line 82 in extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 21 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:82)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:82)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)

Check failure on line 82 in extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java

View check run for this annotation

quarkus-bot / Build summary for 7a130bf7d7b852435d457f19069ed3c11cab1e9a

JVM Tests - JDK 17 Windows 

java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:82)
Raw output 
java.util.NoSuchElementException: No value present
	at java.base/java.util.Optional.get(Optional.java:143)
	at io.quarkus.rest.client.reactive.GlobalConfigurationTest.checkGlobalConfigValues(GlobalConfigurationTest.java:82)
	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:521)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:435)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
.isEqualTo(new MemorySizeConverter().convert("5M").asBigInteger());
assertThat(configRoot.multipart().memoryThreshold().get().asBigInteger())
.isEqualTo(new MemorySizeConverter().convert("10M").asBigInteger());
}
}
19 changes: 19 additions & 0 deletions .../runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientBuilderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import io.quarkus.arc.InstanceHandle;
import io.quarkus.rest.client.reactive.runtime.ProxyAddressUtil.HostAndPort;
import io.quarkus.restclient.config.RestClientsConfig;
import io.quarkus.runtime.configuration.MemorySize;
import io.quarkus.tls.TlsConfiguration;
import io.smallrye.config.SmallRyeConfig;
import io.vertx.core.net.KeyCertOptions;
Expand Down Expand Up @@ -527,6 +528,24 @@ public <T> T build(Class<T> aClass) throws IllegalStateException, RestClientDefi
clientBuilder.maxChunkSize(DEFAULT_MAX_CHUNK_SIZE);
}

MemorySize fileThreshold = (MemorySize) getConfiguration()
.getProperty(QuarkusRestClientProperties.MULTIPART_FILE_THRESHOLD);
if (fileThreshold != null) {
property("dev.resteasy.entity.file.threshold", fileThreshold.asLongValue());
} else if (restClients.multipart().fileThreshold().isPresent()) {
property("dev.resteasy.entity.file.threshold",
restClients.multipart().fileThreshold().get().asLongValue());
}

MemorySize memoryThreshold = (MemorySize) getConfiguration()
.getProperty(QuarkusRestClientProperties.MULTIPART_MEMORY_THRESHOLD);
if (memoryThreshold != null) {
property("dev.resteasy.entity.memory.threshold", memoryThreshold.asLongValue());
} else if (restClients.multipart().memoryThreshold().isPresent()) {
property("dev.resteasy.entity.memory.threshold",
restClients.multipart().memoryThreshold().get().asLongValue());
}

if (getConfiguration().hasProperty(QuarkusRestClientProperties.HTTP2)) {
clientBuilder.http2((Boolean) getConfiguration().getProperty(QuarkusRestClientProperties.HTTP2));
} else if (restClients.http2()) {
Expand Down
14 changes: 14 additions & 0 deletions ...e/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,20 @@ private void configureCustomProperties(QuarkusRestClientBuilder builder) {
: Optional.empty());
builder.property(QuarkusRestClientProperties.MAX_CHUNK_SIZE, maxChunkSize.orElse(DEFAULT_MAX_CHUNK_SIZE));

Optional<MemorySize> fileThreshold = oneOf(restClientConfig.multipart().fileThreshold(),
configRoot.multipart().fileThreshold());
if (fileThreshold.isPresent()) {
builder.property("dev.resteasy.entity.file.threshold",
fileThreshold.get().asLongValue());
}

Optional<MemorySize> memoryThreshold = oneOf(restClientConfig.multipart().memoryThreshold(),
configRoot.multipart().memoryThreshold());
if (memoryThreshold.isPresent()) {
builder.property("dev.resteasy.entity.memory.threshold",
memoryThreshold.get().asLongValue());
}

Optional<Boolean> enableCompressions = oneOf(restClientConfig.enableCompression(), configRoot.enableCompression());
if (enableCompressions.isPresent()) {
builder.enableCompression(enableCompressions.get());
Expand Down
13 changes: 13 additions & 0 deletions ...c/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import io.quarkus.restclient.config.RegisteredRestClient;
import io.quarkus.restclient.config.RestClientsConfig;
import io.quarkus.runtime.configuration.ConfigUtils;
import io.quarkus.runtime.configuration.MemorySizeConverter;
import io.smallrye.config.SmallRyeConfigBuilder;
import io.smallrye.config.SmallRyeConfigBuilderCustomizer;

Expand Down Expand Up @@ -143,6 +144,10 @@ public List<RegisteredRestClient> getRestClients() {
verify(restClientBuilderMock).property(KEEP_ALIVE_ENABLED, false);
verify(restClientBuilderMock).property(MAX_REDIRECTS, 104);
verify(restClientBuilderMock).property(MAX_CHUNK_SIZE, 1024);
verify(restClientBuilderMock).property("dev.resteasy.entity.file.threshold",
new MemorySizeConverter().convert("50M").asLongValue());
verify(restClientBuilderMock).property("dev.resteasy.entity.memory.threshold",
new MemorySizeConverter().convert("100M").asLongValue());
verify(restClientBuilderMock).followRedirects(true);
verify(restClientBuilderMock).register(MyResponseFilter1.class);
verify(restClientBuilderMock).queryParamStyle(COMMA_SEPARATED);
Expand Down Expand Up @@ -197,6 +202,10 @@ public List<RegisteredRestClient> getRestClients() {
verify(restClientBuilderMock).property(KEEP_ALIVE_ENABLED, true);
verify(restClientBuilderMock).property(MAX_REDIRECTS, 204);
verify(restClientBuilderMock).property(MAX_CHUNK_SIZE, 1024);
verify(restClientBuilderMock).property("dev.resteasy.entity.file.threshold",
new MemorySizeConverter().convert("5M").asLongValue());
verify(restClientBuilderMock).property("dev.resteasy.entity.memory.threshold",
new MemorySizeConverter().convert("10M").asLongValue());
verify(restClientBuilderMock).followRedirects(true);
verify(restClientBuilderMock).register(MyResponseFilter2.class);
verify(restClientBuilderMock).queryParamStyle(MULTI_PAIRS);
Expand Down Expand Up @@ -224,6 +233,8 @@ private static Map<String, String> createSampleConfigRoot() {
rootConfig.put("quarkus.rest-client.keep-alive-enabled", "true");
rootConfig.put("quarkus.rest-client.max-redirects", "204");
rootConfig.put("quarkus.rest-client.multipart-max-chunk-size", "1024");
rootConfig.put("quarkus.rest-client.multipart.file-threshold", "5M");
rootConfig.put("quarkus.rest-client.multipart.memory-threshold", "10M");
rootConfig.put("quarkus.rest-client.follow-redirects", "true");
rootConfig.put("quarkus.rest-client.max-chunk-size", "1024");
rootConfig.put("quarkus.rest-client.providers",
Expand Down Expand Up @@ -260,6 +271,8 @@ private static Map<String, String> createSampleClientConfig(final String restCli
clientConfig.put("quarkus.rest-client." + restClientName + ".max-redirects", "104");
clientConfig.put("quarkus.rest-client." + restClientName + ".follow-redirects", "true");
clientConfig.put("quarkus.rest-client." + restClientName + ".max-chunk-size", "1024");
clientConfig.put("quarkus.rest-client." + restClientName + ".multipart.file-threshold", "50M");
clientConfig.put("quarkus.rest-client." + restClientName + ".multipart.memory-threshold", "100M");
clientConfig.put("quarkus.rest-client." + restClientName + ".providers",
"io.quarkus.rest.client.reactive.runtime.RestClientCDIDelegateBuilderTest$MyResponseFilter1");
clientConfig.put("quarkus.rest-client." + restClientName + ".query-param-style", "comma-separated");
Expand Down
9 changes: 9 additions & 0 deletions ...ime/src/main/java/org/jboss/resteasy/reactive/client/api/QuarkusRestClientProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ public class QuarkusRestClientProperties {
*/
public static final String MAX_CHUNK_SIZE = "io.quarkus.rest.client.max-chunk-size";

/**
* Configure the threshold to use for the amount of data to store in memory for entities.
*/
public static final String MULTIPART_FILE_THRESHOLD = "io.quarkus.rest.client.multipart.file-threshold";
/**
* Configure the threshold to use for the amount of data that can be stored in a file for entities.
*/
public static final String MULTIPART_MEMORY_THRESHOLD = "io.quarkus.rest.client.multipart.memory-threshold";

/**
* Configure the connect timeout in ms.
*/
Expand Down
4 changes: 3 additions & 1 deletion integration-tests/rest-client-reactive-multipart/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ multipart-client/mp-rest/url=${test.url}
multipart-chunks-client/mp-rest/url=${test.url}

quarkus.rest-client.multipart-chunks-client.max-chunk-size=1000
quarkus.rest-client.multipart-chunks-client.multipart.file-threshold=5M
quarkus.rest-client.multipart-chunks-client.multipart.memory-threshold=10M

quarkus.rest.jackson.optimization.enable-reflection-free-serializers=true
quarkus.rest.jackson.optimization.enable-reflection-free-serializers=true
Loading