Skip to content

refactor deser impl for symmetry with the ser approach #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
goekay wants to merge 1 commit into from
Closed

refactor deser impl for symmetry with the ser approach #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ...c/main/java/de/rwth/idsg/ocpp/jaxb/validation/BeanDeserializerModifierWithValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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((BeanDeserializerBase) deserializer, validator);
}

return deserializer;
Expand Down
15 changes: 7 additions & 8 deletions ...-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/validation/BeanDeserializerWithValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
package de.rwth.idsg.ocpp.jaxb.validation;

import lombok.RequiredArgsConstructor;
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.bean.BeanDeserializerBase;

import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validator;

/**
* https://www.baeldung.com/java-object-validation-deserialization
*/
public class BeanDeserializerWithValidation extends BeanDeserializer {
@RequiredArgsConstructor
public class BeanDeserializerWithValidation extends ValueDeserializer<Object> {

private final BeanDeserializerBase delegate;
private final Validator validator;

public BeanDeserializerWithValidation(BeanDeserializer src, Validator validator) {
super(src);
this.validator = validator;
}

@Override
public Object deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException {
var instance = super.deserialize(p, ctxt);
var instance = delegate.deserialize(p, ctxt);

var violations = validator.validate(instance);
if (!violations.isEmpty()) {
Expand Down
Loading