Added additional web configuration

bcgov · Jul 18, 2024 · fb9f15d · fb9f15d
1 parent a9f6478
commit fb9f15d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/config/GradTraxConfig.java b/api/src/main/java/ca/bc/gov/educ/api/trax/config/GradTraxConfig.java
@@ -23,6 +23,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.DefaultUriBuilderFactory;
 import reactor.netty.http.client.HttpClient;
 
 @Configuration
@@ -52,7 +53,10 @@ public RestTemplate restTemplate(RestTemplateBuilder builder) {
 	public WebClient getTraxClientWebClient(OAuth2AuthorizedClientManager authorizedClientManager) {
 		ServletOAuth2AuthorizedClientExchangeFilterFunction filter = new ServletOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager);
 		filter.setDefaultClientRegistrationId("traxclient");
+		DefaultUriBuilderFactory defaultUriBuilderFactory = new DefaultUriBuilderFactory();
+		defaultUriBuilderFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE);
 		return WebClient.builder()
+				.uriBuilderFactory(defaultUriBuilderFactory)
 				.exchangeStrategies(ExchangeStrategies
 						.builder()
 						.codecs(codecs -> codecs
@@ -68,7 +72,10 @@ public WebClient getTraxClientWebClient(OAuth2AuthorizedClientManager authorized
 	public WebClient getInstituteWebClient(OAuth2AuthorizedClientManager authorizedClientManager) {
 		ServletOAuth2AuthorizedClientExchangeFilterFunction filter = new ServletOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager);
 		filter.setDefaultClientRegistrationId("institute-web-client");
+		DefaultUriBuilderFactory defaultUriBuilderFactory = new DefaultUriBuilderFactory();
+		defaultUriBuilderFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE);
 		return WebClient.builder()
+				.uriBuilderFactory(defaultUriBuilderFactory)
 				.exchangeStrategies(ExchangeStrategies
 						.builder()
 						.codecs(codecs -> codecs

diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/service/RESTService.java b/api/src/main/java/ca/bc/gov/educ/api/trax/service/RESTService.java
@@ -5,12 +5,12 @@
 import ca.bc.gov.educ.api.trax.util.EducGradTraxApiConstants;
 import ca.bc.gov.educ.api.trax.util.ThreadLocalStateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
 
@@ -63,7 +63,11 @@ public <T> T get(String url, Class<T> clazz, String accessToken) {
                     .block();
         } catch (Exception e) {
             // catches IOExceptions and the like
-            throw new ServiceException(getErrorMessage(url, e.getLocalizedMessage()), HttpStatus.SERVICE_UNAVAILABLE.value(), e);
+            throw new ServiceException(getErrorMessage(
+                    url,
+                    e.getLocalizedMessage()),
+                    (e instanceof WebClientResponseException) ? ((WebClientResponseException) e).getStatusCode().value() : HttpStatus.SERVICE_UNAVAILABLE.value(),
+                    e);
         }
         return obj;
     }
@@ -92,7 +96,11 @@ public <T> T get(String url, Class<T> clazz, WebClient webClient) {
                     .block();
         } catch (Exception e) {
             // catches IOExceptions and the like
-            throw new ServiceException(getErrorMessage(url, e.getLocalizedMessage()), HttpStatus.SERVICE_UNAVAILABLE.value(), e);
+            throw new ServiceException(getErrorMessage(
+                    url,
+                    e.getLocalizedMessage()),
+                    (e instanceof WebClientResponseException) ? ((WebClientResponseException) e).getStatusCode().value() : HttpStatus.SERVICE_UNAVAILABLE.value(),
+                    e);
         }
         return obj;
     }
@@ -124,7 +132,11 @@ public <T> T post(String url, Object body, Class<T> clazz, String accessToken) {
                             }))
                     .block();
         } catch (Exception e) {
-            throw new ServiceException(getErrorMessage(url, e.getLocalizedMessage()), HttpStatus.SERVICE_UNAVAILABLE.value(), e);
+            throw new ServiceException(getErrorMessage(
+                    url,
+                    e.getLocalizedMessage()),
+                    (e instanceof WebClientResponseException) ? ((WebClientResponseException) e).getStatusCode().value() : HttpStatus.SERVICE_UNAVAILABLE.value(),
+                    e);
         }
         return obj;
     }
@@ -149,7 +161,11 @@ public <T> T post(String url, Object body, Class<T> clazz, WebClient webClient)
                             }))
                     .block();
         } catch (Exception e) {
-            throw new ServiceException(getErrorMessage(url, e.getLocalizedMessage()), HttpStatus.SERVICE_UNAVAILABLE.value(), e);
+            throw new ServiceException(getErrorMessage(
+                    url,
+                    e.getLocalizedMessage()),
+                    (e instanceof WebClientResponseException) ? ((WebClientResponseException) e).getStatusCode().value() : HttpStatus.SERVICE_UNAVAILABLE.value(),
+                    e);
         }
         return obj;
     }