Fix #825: Propagate connectionTimeout type change from core RestClien… (

#826) * Fix #825: Propagate connectionTimeout type change from core RestClientConfiguration - Update usage of Duration-type connectionTimeout property
wultra · Aug 10, 2023 · 92bd871 · 92bd871
1 parent 1b45ec5
commit 92bd871
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...c/main/java/com/wultra/app/onboardingserver/presencecheck/iproov/config/IProovConfig.java b/...c/main/java/com/wultra/app/onboardingserver/presencecheck/iproov/config/IProovConfig.java
@@ -172,7 +172,7 @@ private static ReactiveOAuth2AccessTokenResponseClient<OAuth2ClientCredentialsGr
 
     private static WebClient createWebClient(final ExchangeFilterFunction filter, IProovConfigProps configProps, final String logContext) {
         final RestClientConfiguration restClientConfig = configProps.getRestClientConfig();
-        final Integer connectionTimeout = restClientConfig.getConnectionTimeout();
+        final Duration connectionTimeout = restClientConfig.getConnectionTimeout();
         final Duration responseTimeout = restClientConfig.getResponseTimeout();
         final Duration maxIdleTime = Objects.requireNonNull(restClientConfig.getMaxIdleTime(), "maxIdleTime must be specified");
         logger.info("Setting {} connectionTimeout: {}, responseTimeout: {}, maxIdleTime: {}", logContext, connectionTimeout, responseTimeout, maxIdleTime);
@@ -181,7 +181,7 @@ private static WebClient createWebClient(final ExchangeFilterFunction filter, IP
                 .maxIdleTime(maxIdleTime)
                 .build();
         HttpClient httpClient = HttpClient.create(connectionProvider)
-                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, connectionTimeout)
+                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, Math.toIntExact(connectionTimeout.toMillis()))
                 .responseTimeout(responseTimeout);
 
         if (restClientConfig.isProxyEnabled()) {

diff --git a/...om/wultra/app/onboardingserver/provider/rest/RestOnboardingProviderAutoConfiguration.java b/...om/wultra/app/onboardingserver/provider/rest/RestOnboardingProviderAutoConfiguration.java
@@ -65,7 +65,7 @@ public RestClient restClient(
 
         final RestClientConfiguration config = new RestClientConfiguration();
         config.setBaseUrl(url);
-        config.setConnectionTimeout((int) configuration.getConnectionTimeout().toMillis());
+        config.setConnectionTimeout(configuration.getConnectionTimeout());
         config.setResponseTimeout(configuration.getResponseTimeout());
         config.setHandshakeTimeout(configuration.getHandshakeTimeout());
         config.setDefaultHttpHeaders(headers);