adding javaTimeModule that is required by Jackson

Author: ORybak5

service/build.gradle

@@ -41,6 +41,7 @@ dependencies {
 
 	// Use version specified in spring-boot-starter-web
 	implementation 'com.fasterxml.jackson.core:jackson-databind'
+	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2'
 
 	// WebClient
 	implementation ('org.springframework.boot:spring-boot-starter-webflux')

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

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -15,6 +16,8 @@ public ObjectMapper objectMapper() {
         mapper.getFactory().setStreamReadConstraints(
             StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build());
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.registerModule(new JavaTimeModule());
+
         return mapper;
     }
 }

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

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

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

@@ -3,13 +3,17 @@
 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;
@@ -21,6 +25,8 @@ 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/EhrStatusRequest.java

@@ -2,11 +2,15 @@
 
 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/mhs/model/Identifier.java

@@ -1,10 +1,14 @@
 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/test/java/uk/nhs/adaptors/gp2gp/common/configuration/ObjectMapperConfigTest.java

@@ -8,6 +8,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ObjectMapperConfigTest {
 
@@ -26,6 +27,15 @@ void objectMapperConfigSetToWorkWithUnlimitedDataSizeTest() {
         context.close();
     }
 
+    @Test
+    public void javaTimeModuleIsRegisteredTest() {
+        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ObjectMapperConfig.class);
+        ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
+
+        boolean javaTimeModuleRegistered = objectMapper.getRegisteredModuleIds().contains("jackson-datatype-jsr310");
+        assertTrue(javaTimeModuleRegistered);
+    }
+
     @Test
     public void objectMapperConfigIgnoresUnknownPropertiesTest() {