removing data limit in Spring-instantiated objectMapper

Author: ORybak5

service/src/main/java/uk/nhs/adaptors/gp2gp/common/configuration/ObjectMapperConfig.java

@@ -0,0 +1,20 @@
+package uk.nhs.adaptors.gp2gp.common.configuration;
+
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ObjectMapperPostProcessorConfig implements BeanPostProcessor {
+
+    @Override
+    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+        if (bean instanceof ObjectMapper) {
+            ObjectMapper objectMapper = (ObjectMapper) bean;
+            objectMapper.getFactory().setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build());
+        }
+        return bean;
+    }
+}

service/src/main/java/uk/nhs/adaptors/gp2gp/common/configuration/ObjectMapperPostProcessorConfig.java

@@ -12,7 +12,6 @@
 import org.springframework.stereotype.Service;
 import uk.nhs.adaptors.gp2gp.common.configuration.Gp2gpConfiguration;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
-import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
 import uk.nhs.adaptors.gp2gp.common.storage.StorageConnectorService;
 import uk.nhs.adaptors.gp2gp.common.task.TaskExecutor;
 import uk.nhs.adaptors.gp2gp.ehr.model.EhrExtractStatus;
@@ -39,7 +38,6 @@ public class SendDocumentTaskExecutor implements TaskExecutor<SendDocumentTaskDe
     private final DetectDocumentsSentService detectDocumentsSentService;
     private final Gp2gpConfiguration gp2gpConfiguration;
     private final EhrDocumentMapper ehrDocumentMapper;
-    private final TimestampService timestampService;
 
     @Override
     public Class<SendDocumentTaskDefinition> getTaskType() {

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/SendDocumentTaskExecutor.java

@@ -58,7 +58,6 @@ public EhrExtractStatus(Instant created, Instant updatedAt, String conversationI
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -75,7 +74,6 @@ public static class EhrRequest {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -99,7 +97,6 @@ public static class GpcDocument {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -111,7 +108,6 @@ public static class GpcAccessStructured {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -120,7 +116,6 @@ public static class GpcAccessDocument {
         private String patientId;
 
         @Data
-        @NoArgsConstructor
         @AllArgsConstructor
         @Document
         @Builder
@@ -132,7 +127,6 @@ public static class SentToMhs {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -142,7 +136,6 @@ public static class EhrExtractCore {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -152,7 +145,6 @@ public static class EhrExtractCorePending {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -161,7 +153,6 @@ public static class EhrContinue {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -174,7 +165,6 @@ public static class AckToRequester {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -186,7 +176,6 @@ public static class AckPending {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -199,7 +188,6 @@ public static class EhrReceivedAcknowledgement {
         private String messageRef;
 
         @Data
-        @NoArgsConstructor
         @AllArgsConstructor
         @Document
         @Builder
@@ -210,7 +198,6 @@ public static class ErrorDetails {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder
@@ -219,7 +206,6 @@ public static class AckHistory {
     }
 
     @Data
-    @NoArgsConstructor
     @AllArgsConstructor
     @Document
     @Builder

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/model/EhrExtractStatus.java

@@ -3,17 +3,13 @@
 import java.time.Instant;
 import java.util.List;
 
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import uk.nhs.adaptors.gp2gp.ehr.model.EhrExtractStatus;
 import uk.nhs.adaptors.gp2gp.mhs.model.Identifier;
 
 @Builder
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class EhrStatus {
 
     private List<AttachmentStatus> attachmentStatus;
@@ -25,8 +21,6 @@ public class EhrStatus {
 
     @Builder
     @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
     public static class AttachmentStatus {
         private List<Identifier> identifier;
         private FileStatus fileStatus;

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/status/model/EhrStatus.java

@@ -1,16 +1,11 @@
 package uk.nhs.adaptors.gp2gp.ehr.status.model;
 
 import java.time.Instant;
-
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Builder
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class EhrStatusRequest {
 
     private Instant initialRequestTimestamp;

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/status/model/EhrStatusRequest.java

@@ -1,14 +1,10 @@
 package uk.nhs.adaptors.gp2gp.mhs.model;
 
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Builder
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class Identifier {
     private String system;
     private String value;

service/src/main/java/uk/nhs/adaptors/gp2gp/mhs/model/Identifier.java

@@ -0,0 +1,42 @@
+package uk.nhs.adaptors.gp2gp.common.configuration;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class ObjectMapperPostProcessorConfigTest {
+
+    @Mock
+    private ObjectMapper objectMapper;
+
+    @Mock
+    private JsonFactory mockJsonFactory;
+
+    @InjectMocks
+    private ObjectMapperPostProcessorConfig objectMapperPostProcessorConfig;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.openMocks(this);
+    }
+
+    @Test
+    public void objectMapperPostProcessSetsMaxDataProcessingLimitTest() {
+
+        when(objectMapper.getFactory()).thenReturn(mockJsonFactory);
+
+        objectMapperPostProcessorConfig.postProcessAfterInitialization(objectMapper, "objectMapper");
+
+        verify(mockJsonFactory, times(1))
+            .setStreamReadConstraints(argThat(constraints -> constraints.getMaxStringLength() == Integer.MAX_VALUE));
+    }
+}

service/src/test/java/uk/nhs/adaptors/gp2gp/common/configuration/ObjectMapperConfigTest.java

@@ -202,8 +202,7 @@ public void setup() {
                 new ObjectMapper(),
                 this.detectDocumentsSentService,
                 gp2gpConfiguration,
-                new EhrDocumentMapper(new TimestampService(), new RandomIdGeneratorServiceStub()),
-                new TimestampService()
+                new EhrDocumentMapper(new TimestampService(), new RandomIdGeneratorServiceStub())
         );
     }