improve bean validation impl for deser

Author: goekay

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

@@ -5,9 +5,8 @@
 import tools.jackson.databind.DeserializationConfig;
 import tools.jackson.databind.ValueDeserializer;
 import tools.jackson.databind.deser.ValueDeserializerModifier;
-import tools.jackson.databind.deser.bean.BeanDeserializer;
+import tools.jackson.databind.deser.bean.BeanDeserializerBase;
 
-import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 
 /**
@@ -22,8 +21,8 @@ public class BeanDeserializerModifierWithValidation extends ValueDeserializerMod
     public ValueDeserializer<?> modifyDeserializer(DeserializationConfig config,
                                                    Supplier beanDescRef,
                                                    ValueDeserializer<?> deserializer) {
-        if (deserializer instanceof BeanDeserializer) {
-            return new BeanDeserializerWithValidation((BeanDeserializer) deserializer, validator);
+        if (deserializer instanceof BeanDeserializerBase) {
+            return new BeanDeserializerWithValidation(deserializer, validator);
         }
 
         return deserializer;

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

@@ -3,32 +3,55 @@
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonParser;
 import tools.jackson.databind.DeserializationContext;
-import tools.jackson.databind.deser.bean.BeanDeserializer;
+import tools.jackson.databind.ValueDeserializer;
+import tools.jackson.databind.deser.std.DelegatingDeserializer;
+import tools.jackson.databind.jsontype.TypeDeserializer;
 
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.Validator;
 
 /**
  * https://www.baeldung.com/java-object-validation-deserialization
  */
-public class BeanDeserializerWithValidation extends BeanDeserializer {
+public class BeanDeserializerWithValidation extends DelegatingDeserializer {
 
     private final Validator validator;
 
-    public BeanDeserializerWithValidation(BeanDeserializer src, Validator validator) {
-        super(src);
+    protected BeanDeserializerWithValidation(ValueDeserializer<?> delegate, Validator validator) {
+        super(delegate);
         this.validator = validator;
     }
 
     @Override
-    public Object deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException {
-        var instance = super.deserialize(p, ctxt);
+    protected ValueDeserializer<?> newDelegatingInstance(ValueDeserializer<?> newDelegate) {
+        return new BeanDeserializerWithValidation(newDelegate, validator);
+    }
+
+    @Override
+    public Object deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) {
+        Object instance = super.deserialize(jsonParser, deserializationContext);
+        validate(instance);
+        return instance;
+    }
 
-        var violations = validator.validate(instance);
+    @Override
+    public Object deserialize(JsonParser jsonParser, DeserializationContext deserializationContext, Object bean) {
+        Object instance = super.deserialize(jsonParser, deserializationContext, bean);
+        validate(instance);
+        return instance;
+    }
+
+    @Override
+    public Object deserializeWithType(JsonParser p, DeserializationContext ctxt, TypeDeserializer typeDeserializer) throws JacksonException {
+        Object instance = super.deserializeWithType(p, ctxt, typeDeserializer);
+        validate(instance);
+        return instance;
+    }
+
+    private <T> void validate(T object) {
+        var violations = validator.validate(object);
         if (!violations.isEmpty()) {
             throw new ConstraintViolationException(violations);
         }
-
-        return instance;
     }
 }