DTSPB-4818 update ResponseDecorator with spring

Author: MarcusHMCTS

src/main/java/uk/gov/hmcts/probate/client/ResponseDecorator.java

@@ -5,7 +5,6 @@
 import feign.Response;
 import feign.Util;
 import lombok.extern.slf4j.Slf4j;
-import uk.gov.hmcts.probate.configuration.ApplicationContextProvider;
 import uk.gov.hmcts.reform.probate.model.client.ErrorResponse;
 
 import java.io.IOException;
@@ -18,10 +17,10 @@ public class ResponseDecorator {
 
     private ObjectMapper objectMapper;
 
-    public ResponseDecorator(Response response) {
+    public ResponseDecorator(Response response, ObjectMapper objectMapper) {
 
         this.response = response;
-        this.objectMapper = ApplicationContextProvider.getApplicationContext().getBean(ObjectMapper.class);
+        this.objectMapper = objectMapper;
     }
 
     public String bodyToString() {

src/main/java/uk/gov/hmcts/probate/client/submit/SubmitServiceApiErrorDecoder.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.probate.client.submit;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
 import feign.codec.ErrorDecoder;
 import lombok.extern.slf4j.Slf4j;
@@ -12,11 +13,17 @@
 @Slf4j
 public class SubmitServiceApiErrorDecoder implements ErrorDecoder {
 
+    private ObjectMapper objectMapper;
+
+    public SubmitServiceApiErrorDecoder(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
     @Override
     public Exception decode(String methodKey, Response response) {
         log.error("Response status: {}", response.status());
 
-        ResponseDecorator responseDecorator = new ResponseDecorator(response);
+        ResponseDecorator responseDecorator = new ResponseDecorator(response,this.objectMapper);
         ErrorResponse errorResponse = responseDecorator.mapToErrorResponse();
 
         return new ApiClientException(response.status(), errorResponse);

src/main/java/uk/gov/hmcts/probate/client/submit/SubmitServiceConfiguration.java

@@ -17,15 +17,16 @@ public class SubmitServiceConfiguration {
     static final String INVITATION_ID = "invitationId";
     static final String CASE_ID = "caseId";
 
+
     @Bean
     @Primary
     public Decoder feignDecoder(ObjectMapper objectMapper) {
         return new JacksonDecoder(objectMapper);
     }
 
     @Bean
-    public SubmitServiceApiErrorDecoder submitServiceApiErrorDecoder() {
-        return new SubmitServiceApiErrorDecoder();
+    public SubmitServiceApiErrorDecoder submitServiceApiErrorDecoder(ObjectMapper objectMapper) {
+        return new SubmitServiceApiErrorDecoder(objectMapper);
     }
 
     @Bean

src/main/java/uk/gov/hmcts/probate/configuration/ApplicationContextProvider.java

@@ -45,7 +45,7 @@ public void bodyToStringShouldReturnString() throws ReflectiveOperationException
                 .body("hello world", UTF_8)
                 .build();
 
-        ResponseDecorator responseDecorator = new ResponseDecorator(response);
+        ResponseDecorator responseDecorator = new ResponseDecorator(response,objectMapper);
         Field objectMapperField = ResponseDecorator.class.getDeclaredField("objectMapper");
         objectMapperField.setAccessible(true);
         objectMapperField.set(responseDecorator, objectMapper);
@@ -63,7 +63,7 @@ public void bodyToStringShouldReturnEmptyStringIfResponseBodyIsNull() {
                 .headers(headers)
                 .build();
 
-        ResponseDecorator responseDecorator = new ResponseDecorator(response);
+        ResponseDecorator responseDecorator = new ResponseDecorator(response,objectMapper);
         String body = responseDecorator.bodyToString();
 
         assertThat(response.body()).isNull();
@@ -84,7 +84,7 @@ public int read() throws IOException {
                     }
                 }, 1)
                 .build();
-        ResponseDecorator responseDecorator = new ResponseDecorator(response);
+        ResponseDecorator responseDecorator = new ResponseDecorator(response,objectMapper);
 
         String body = responseDecorator.bodyToString();
 
@@ -103,7 +103,7 @@ public void mapToErrorResponseShouldReturnValidationErrorResponse() throws IOExc
                 .body(validationErrorResponse, UTF_8)
                 .build();
 
-        ResponseDecorator responseDecorator = new ResponseDecorator(response);
+        ResponseDecorator responseDecorator = new ResponseDecorator(response,objectMapper);
         ErrorResponse errorResponse = responseDecorator.mapToErrorResponse();
 
         assertThat(errorResponse.getType()).isEqualTo(ErrorType.VALIDATION);
@@ -121,7 +121,7 @@ public void mapToErrorResponseShouldReturnApiClientErrorResponse() throws IOExce
                 .body(apiClientErrorResponse, UTF_8)
                 .build();
 
-        ResponseDecorator responseDecorator = new ResponseDecorator(response);
+        ResponseDecorator responseDecorator = new ResponseDecorator(response,objectMapper);
         ErrorResponse errorResponse = responseDecorator.mapToErrorResponse();
 
         assertThat(errorResponse.getType()).isEqualTo(ErrorType.API_CLIENT);
@@ -137,7 +137,7 @@ public void mapToErrorResponseResponseBodyIsNull() {
                 .headers(headers)
                 .build();
 
-        ResponseDecorator responseDecorator = new ResponseDecorator(response);
+        ResponseDecorator responseDecorator = new ResponseDecorator(response,objectMapper);
         ErrorResponse errorResponse = responseDecorator.mapToErrorResponse();
 
         assertThat(errorResponse).isNull();

src/test/java/uk/gov/hmcts/probate/client/ResponseDecoratorTest.java

@@ -1,10 +1,15 @@
 package uk.gov.hmcts.probate.client;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Request;
 import feign.Response;
 import feign.Util;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import uk.gov.hmcts.probate.client.submit.SubmitServiceApiErrorDecoder;
 import uk.gov.hmcts.reform.probate.model.client.ApiClientException;
 
@@ -15,15 +20,20 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
 public class SubmitServiceApiErrorDecoderTest {
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     private Map<String, Collection<String>> headers = new LinkedHashMap<>();
 
-    private SubmitServiceApiErrorDecoder errorDecoder = new SubmitServiceApiErrorDecoder();
+    private SubmitServiceApiErrorDecoder errorDecoder;
 
     @Test
     public void throwsApiClientException() throws Throwable {
+        errorDecoder = new SubmitServiceApiErrorDecoder(objectMapper);
         assertThrows(ApiClientException.class, () -> {
             Response response = Response.builder()
                     .status(500)
@@ -32,7 +42,6 @@ public void throwsApiClientException() throws Throwable {
                             "/api", Collections.emptyMap(), null, Util.UTF_8))
                     .headers(headers)
                     .build();
-
             throw errorDecoder.decode("Service#foo()", response);
         });