refactor

Author: goekay

ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/validation/BeanDeserializerModifierWithValidation.java

@@ -1,22 +1,29 @@
 package de.rwth.idsg.ocpp.jaxb.validation;
 
+import lombok.RequiredArgsConstructor;
 import tools.jackson.databind.BeanDescription.Supplier;
 import tools.jackson.databind.DeserializationConfig;
 import tools.jackson.databind.ValueDeserializer;
 import tools.jackson.databind.deser.ValueDeserializerModifier;
 import tools.jackson.databind.deser.bean.BeanDeserializer;
 
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
 /**
  * https://www.baeldung.com/java-object-validation-deserialization
  */
+@RequiredArgsConstructor
 public class BeanDeserializerModifierWithValidation extends ValueDeserializerModifier {
 
+    private final Validator validator;
+
     @Override
     public ValueDeserializer<?> modifyDeserializer(DeserializationConfig config,
                                                    Supplier beanDescRef,
                                                    ValueDeserializer<?> deserializer) {
         if (deserializer instanceof BeanDeserializer) {
-            return new BeanDeserializerWithValidation((BeanDeserializer) deserializer);
+            return new BeanDeserializerWithValidation((BeanDeserializer) deserializer, validator);
         }
 
         return deserializer;

ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/validation/BeanDeserializerWithValidation.java

@@ -6,7 +6,6 @@
 import tools.jackson.databind.deser.bean.BeanDeserializer;
 
 import jakarta.validation.ConstraintViolationException;
-import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 
 /**
@@ -16,22 +15,20 @@ public class BeanDeserializerWithValidation extends BeanDeserializer {
 
     private final Validator validator;
 
-    public BeanDeserializerWithValidation(BeanDeserializer src) {
+    public BeanDeserializerWithValidation(BeanDeserializer src, Validator validator) {
         super(src);
-        validator = Validation.buildDefaultValidatorFactory().getValidator();
+        this.validator = validator;
     }
 
     @Override
     public Object deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException {
         var instance = super.deserialize(p, ctxt);
-        validate(instance);
-        return instance;
-    }
 
-    private void validate(Object instance) {
         var violations = validator.validate(instance);
         if (!violations.isEmpty()) {
             throw new ConstraintViolationException(violations);
         }
+
+        return instance;
     }
 }

ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/validation/BeanValidationModule.java

@@ -2,13 +2,19 @@
 
 import tools.jackson.databind.module.SimpleModule;
 
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
 /**
  * https://www.baeldung.com/java-object-validation-deserialization
  */
 public class BeanValidationModule extends SimpleModule {
 
     public BeanValidationModule() {
-        super();
-        setDeserializerModifier(new BeanDeserializerModifierWithValidation());
+        this(Validation.buildDefaultValidatorFactory().getValidator());
+    }
+
+    public BeanValidationModule(Validator validator) {
+        setDeserializerModifier(new BeanDeserializerModifierWithValidation(validator));
     }
 }

ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/BeanValidationTest.java

@@ -4,6 +4,7 @@
 import ocpp.cs._2015._10.StartTransactionRequest;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.json.JsonMapper;
@@ -18,15 +19,19 @@
 
 public class BeanValidationTest {
 
-    private final ObjectMapper mapper = JsonMapper.builder()
-        .addModule(new JodaModule())
-        .addModule(new BeanValidationModule())
-        .build();
+    private static ObjectMapper mapper;
+
+    @BeforeAll
+    public static void setup() {
+        mapper = JsonMapper.builder()
+            .addModule(new JodaModule())
+            .addModule(new BeanValidationModule())
+            .build();
+    }
 
     @Test
     public void nullFieldsOcpp12() {
         String input = mapper.writeValueAsString(new ocpp.cs._2010._08.StartTransactionRequest());
-        System.out.println(input);
 
         var exception = assertThrows(ConstraintViolationException.class, () -> mapper.readValue(input, ocpp.cs._2010._08.StartTransactionRequest.class));
 
@@ -37,7 +42,6 @@ public void nullFieldsOcpp12() {
     @Test
     public void nullFieldsOcpp15() {
         String input = mapper.writeValueAsString(new ocpp.cs._2012._06.StartTransactionRequest());
-        System.out.println(input);
 
         var exception = assertThrows(ConstraintViolationException.class, () -> mapper.readValue(input, ocpp.cs._2012._06.StartTransactionRequest.class));
 
@@ -48,7 +52,6 @@ public void nullFieldsOcpp15() {
     @Test
     public void nullFieldsOcpp16() {
         String input = mapper.writeValueAsString(new ocpp.cs._2015._10.StartTransactionRequest());
-        System.out.println(input);
 
         var exception = assertThrows(ConstraintViolationException.class, () -> mapper.readValue(input, ocpp.cs._2015._10.StartTransactionRequest.class));
 
@@ -59,7 +62,6 @@ public void nullFieldsOcpp16() {
     @Test
     public void nullFieldsOcpp16Security() {
         String input = mapper.writeValueAsString(new ocpp._2022._02.security.SecurityEventNotification());
-        System.out.println(input);
 
         var exception = assertThrows(ConstraintViolationException.class, () -> mapper.readValue(input, ocpp._2022._02.security.SecurityEventNotification.class));
 
@@ -70,7 +72,6 @@ public void nullFieldsOcpp16Security() {
     @Test
     public void nullFieldsOcpp2() {
         String input = mapper.writeValueAsString(new ocpp._2020._03.SecurityEventNotificationRequest());
-        System.out.println(input);
 
         var exception = assertThrows(ConstraintViolationException.class, () -> mapper.readValue(input, ocpp._2020._03.SecurityEventNotificationRequest.class));