narrow down the scope where unknown Json property is more tolerated

Author: ORybak5

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

@@ -1,7 +1,6 @@
 package uk.nhs.adaptors.gp2gp.common.configuration;
 
 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;
@@ -13,9 +12,7 @@ public class ObjectMapperConfig {
     @Bean
     public ObjectMapper objectMapper() {
         ObjectMapper mapper = new ObjectMapper();
-        mapper.getFactory().setStreamReadConstraints(
-            StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build());
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.getFactory().setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build());
         mapper.registerModule(new JavaTimeModule());
 
         return mapper;

service/src/main/java/uk/nhs/adaptors/gp2gp/common/task/TaskDefinition.java

@@ -43,5 +43,7 @@ public abstract class TaskDefinition {
      */
     private final String toOdsCode;
 
+    private final TaskType taskType;
+
     public abstract TaskType getTaskType();
 }

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

@@ -2,6 +2,7 @@
 
 import static uk.nhs.adaptors.gp2gp.common.task.TaskType.SEND_ACKNOWLEDGEMENT;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
@@ -12,6 +13,7 @@
 /**
  * Task definition for sending acknowledgment
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 @Jacksonized
 @SuperBuilder
 @Getter

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

@@ -3,11 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ObjectMapperConfigTest {
@@ -28,7 +29,7 @@ void objectMapperConfigSetToWorkWithUnlimitedDataSizeTest() {
     }
 
     @Test
-    public void javaTimeModuleIsRegisteredTest() {
+    void javaTimeModuleIsRegisteredTest() {
         AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ObjectMapperConfig.class);
         ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
 
@@ -37,14 +38,14 @@ public void javaTimeModuleIsRegisteredTest() {
     }
 
     @Test
-    public void objectMapperConfigIgnoresUnknownPropertiesTest() {
+    void objectMapperConfigDoesNotIgnoreUnknownPropertiesTest() {
 
         AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ObjectMapperConfig.class);
         ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
 
         String jsonWithUnknownProperty = "{\"knownProperty\":\"testValue\", \"unknownProperty\":\"extraValue\"}";
 
-        assertDoesNotThrow(() -> {
+        assertThrows(UnrecognizedPropertyException.class, () -> {
             TestClass result = objectMapper.readValue(jsonWithUnknownProperty, TestClass.class);
             assertEquals("testValue", result.knownProperty);
         });