bug/PN-18425: disattivazione dell'encoding sul uriBuilderFactory

Author: paolavitidicaraffa

src/main/java/it/pagopa/pn/ec/commons/configuration/http/WebClientConf.java

@@ -9,6 +9,8 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
@@ -40,15 +42,23 @@ private WebClient.Builder trustAllJsonWebClientBuilder() {
 
     @Bean
     public WebClient ecWebClient(ExternalChannelEndpointProperties externalChannelEndpointProperties) {
-        return defaultJsonWebClientBuilder().baseUrl(externalChannelEndpointProperties.containerBaseUrl()).build();
+        String baseUrl = externalChannelEndpointProperties.containerBaseUrl();
+        return defaultJsonWebClientBuilder().baseUrl(baseUrl)
+                .uriBuilderFactory(getDisabledEncodingFactory(baseUrl))
+                .clientConnector(new JettyClientHttpConnector(jettyHttpClientConf.getJettyHttpClient()))
+                .build();
     }
 
     @Bean
     public WebClient ssWebClient(SafeStorageEndpointProperties safeStorageEndpointProperties) {
-        return defaultJsonWebClientBuilder().baseUrl(safeStorageEndpointProperties.containerBaseUrl()).defaultHeaders(httpHeaders -> {
-            httpHeaders.set(safeStorageEndpointProperties.clientHeaderName(), safeStorageEndpointProperties.clientHeaderValue());
-            httpHeaders.set(safeStorageEndpointProperties.apiKeyHeaderName(), safeStorageEndpointProperties.apiKeyHeaderValue());
-        }).build();
+        String baseUrl = safeStorageEndpointProperties.containerBaseUrl();
+        return defaultJsonWebClientBuilder().baseUrl(baseUrl)
+                .uriBuilderFactory(getDisabledEncodingFactory(baseUrl))
+                .clientConnector(new JettyClientHttpConnector(jettyHttpClientConf.getJettyHttpClient()))
+                .defaultHeaders(httpHeaders -> {
+                    httpHeaders.set(safeStorageEndpointProperties.clientHeaderName(), safeStorageEndpointProperties.clientHeaderValue());
+                    httpHeaders.set(safeStorageEndpointProperties.apiKeyHeaderName(), safeStorageEndpointProperties.apiKeyHeaderValue());
+                }).build();
     }
 
     @Bean
@@ -63,7 +73,11 @@ public WebClient uploadWebClient() {
 
     @Bean
     public WebClient stateMachineWebClient(StateMachineEndpointProperties stateMachineEndpointProperties) {
-        return defaultJsonWebClientBuilder().baseUrl(stateMachineEndpointProperties.containerBaseUrl()).build();
+        String baseUrl = stateMachineEndpointProperties.containerBaseUrl();
+        return defaultJsonWebClientBuilder().baseUrl(baseUrl)
+                .uriBuilderFactory(getDisabledEncodingFactory(baseUrl))
+                .clientConnector(new JettyClientHttpConnector(jettyHttpClientConf.getJettyHttpClient()))
+                .build();
     }
 
     @Bean
@@ -79,25 +93,42 @@ public WebClient consolidatoreWebClient(ConsolidatoreEndpointProperties consolid
     public WebClient pdfRasterWebClient(PdfRasterEndpointProperties pdfRasterEndpointProperties,SafeStorageEndpointProperties safeStorageEndpointProperties){
         String pdfRasterBaseUrl = pdfRasterEndpointProperties.baseUrl();
 
-        return defaultJsonWebClientBuilder().baseUrl(pdfRasterBaseUrl).defaultHeaders(httpHeaders -> {
-            httpHeaders.set(safeStorageEndpointProperties.clientHeaderName(),pdfRasterEndpointProperties.clientHeaderValue());
-            httpHeaders.set(safeStorageEndpointProperties.apiKeyHeaderName(),pdfRasterEndpointProperties.clientHeaderApiKey());
-        }).build();
+        return defaultJsonWebClientBuilder().baseUrl(pdfRasterBaseUrl)
+                .uriBuilderFactory(getDisabledEncodingFactory(pdfRasterBaseUrl))
+                .clientConnector(new JettyClientHttpConnector(jettyHttpClientConf.getJettyHttpClient()))
+                .defaultHeaders(httpHeaders -> {
+                    httpHeaders.set(safeStorageEndpointProperties.clientHeaderName(),pdfRasterEndpointProperties.clientHeaderValue());
+                    httpHeaders.set(safeStorageEndpointProperties.apiKeyHeaderName(),pdfRasterEndpointProperties.clientHeaderApiKey());
+                }).build();
     }
 
     private WebClient defaultConsolidatoreWebClient(ConsolidatoreEndpointProperties consolidatoreEndpointProperties)
     {
-        return defaultJsonWebClientBuilder().baseUrl(consolidatoreEndpointProperties.baseUrl()).defaultHeaders(httpHeaders -> {
-            httpHeaders.set(consolidatoreEndpointProperties.clientHeaderName(), consolidatoreEndpointProperties.clientHeaderValue());
-            httpHeaders.set(consolidatoreEndpointProperties.apiKeyHeaderName(), consolidatoreEndpointProperties.apiKeyHeaderValue());
-        }).build();
+        String consolidatoreBaseUrl = consolidatoreEndpointProperties.baseUrl();
+        return defaultJsonWebClientBuilder().baseUrl(consolidatoreBaseUrl)
+                .uriBuilderFactory(getDisabledEncodingFactory(consolidatoreBaseUrl))
+                .clientConnector(new JettyClientHttpConnector(jettyHttpClientConf.getJettyHttpClient()))
+                .defaultHeaders(httpHeaders -> {
+                    httpHeaders.set(consolidatoreEndpointProperties.clientHeaderName(), consolidatoreEndpointProperties.clientHeaderValue());
+                    httpHeaders.set(consolidatoreEndpointProperties.apiKeyHeaderName(), consolidatoreEndpointProperties.apiKeyHeaderValue());
+                }).build();
     }
 
     private WebClient trustAllConsolidatoreWebClient(ConsolidatoreEndpointProperties consolidatoreEndpointProperties) {
-        return trustAllJsonWebClientBuilder().baseUrl(consolidatoreEndpointProperties.baseUrl()).defaultHeaders(httpHeaders -> {
-            httpHeaders.set(consolidatoreEndpointProperties.clientHeaderName(), consolidatoreEndpointProperties.clientHeaderValue());
-            httpHeaders.set(consolidatoreEndpointProperties.apiKeyHeaderName(), consolidatoreEndpointProperties.apiKeyHeaderValue());
-        }).build();
+        String consolidatoreBaseUrl = consolidatoreEndpointProperties.baseUrl();
+        return trustAllJsonWebClientBuilder().baseUrl(consolidatoreBaseUrl)
+                .uriBuilderFactory(getDisabledEncodingFactory(consolidatoreBaseUrl))
+                .clientConnector(new JettyClientHttpConnector(jettyHttpClientConf.getJettyHttpClient()))
+                .defaultHeaders(httpHeaders -> {
+                    httpHeaders.set(consolidatoreEndpointProperties.clientHeaderName(), consolidatoreEndpointProperties.clientHeaderValue());
+                    httpHeaders.set(consolidatoreEndpointProperties.apiKeyHeaderName(), consolidatoreEndpointProperties.apiKeyHeaderValue());
+                }).build();
+    }
+
+    private DefaultUriBuilderFactory getDisabledEncodingFactory(String baseUrl) {
+        DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(baseUrl);
+        factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE);
+        return factory;
     }
 
 }

src/test/java/it/pagopa/pn/ec/commons/rest/call/ss/file/FileCallTest.java

@@ -16,7 +16,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;