refactor

Author: goekay

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

@@ -4,8 +4,6 @@
 import tools.jackson.databind.BeanDescription;
 import tools.jackson.databind.SerializationConfig;
 import tools.jackson.databind.ValueSerializer;
-import tools.jackson.databind.deser.bean.BeanDeserializer;
-import tools.jackson.databind.ser.BeanSerializer;
 import tools.jackson.databind.ser.ValueSerializerModifier;
 import tools.jackson.databind.ser.bean.BeanSerializerBase;
 
@@ -16,7 +14,6 @@ public class BeanSerializerModifierWithValidation extends ValueSerializerModifie
 
     private final Validator validator;
 
-
     @Override
     public ValueSerializer<?> modifySerializer(SerializationConfig config,
                                                BeanDescription.Supplier beanDesc,

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

@@ -1,30 +1,29 @@
 package de.rwth.idsg.ocpp.jaxb.validation;
 
+import lombok.RequiredArgsConstructor;
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.databind.SerializationContext;
-import tools.jackson.databind.ser.BeanSerializer;
+import tools.jackson.databind.ValueSerializer;
 import tools.jackson.databind.ser.bean.BeanSerializerBase;
 
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.Validator;
 
-public class BeanSerializerWithValidation extends BeanSerializer {
+@RequiredArgsConstructor
+public class BeanSerializerWithValidation extends ValueSerializer<Object> {
 
+    private final BeanSerializerBase delegate;
     private final Validator validator;
 
-    public BeanSerializerWithValidation(BeanSerializerBase src, Validator validator) {
-        super(src);
-        this.validator = validator;
-    }
-
     @Override
-    public void serialize(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException {
+    public void serialize(Object bean, JsonGenerator gen, SerializationContext ctxt) throws JacksonException {
         var violations = validator.validate(bean);
         if (!violations.isEmpty()) {
             throw new ConstraintViolationException(violations);
         }
 
-        super.serialize(bean, gen, provider);
+        delegate.serialize(bean, gen, ctxt);
     }
+
 }