making Jackson mapper more tolerable

Author: ORybak5

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

@@ -1,6 +1,7 @@
 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,6 +14,7 @@ public class ObjectMapperConfig {
     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.registerModule(new JavaTimeModule());
 
         return mapper;

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

@@ -43,7 +43,5 @@ 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

@@ -1,8 +1,6 @@
 package uk.nhs.adaptors.gp2gp.ehr;
 
 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;
@@ -13,7 +11,6 @@
 /**
  * Task definition for sending acknowledgment
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @Jacksonized
 @SuperBuilder
 @Getter

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

@@ -3,12 +3,11 @@
 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 {
@@ -38,14 +37,14 @@ void javaTimeModuleIsRegisteredTest() {
     }
 
     @Test
-    void objectMapperConfigDoesNotIgnoreUnknownPropertiesTest() {
+    void objectMapperConfigIgnoresUnknownPropertiesTest() {
 
         AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ObjectMapperConfig.class);
         ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
 
         String jsonWithUnknownProperty = "{\"knownProperty\":\"testValue\", \"unknownProperty\":\"extraValue\"}";
 
-        assertThrows(UnrecognizedPropertyException.class, () -> {
+        assertDoesNotThrow(() -> {
             TestClass result = objectMapper.readValue(jsonWithUnknownProperty, TestClass.class);
             assertEquals("testValue", result.knownProperty);
         });