Skip to content

Use serializer from createContextual as base deserializer #5

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

Open
mtf90 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use serializer from createContextual as base deserializer #5

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
23 changes: 12 additions & 11 deletions src/main/java/com/codingrodent/jackson/crypto/EncryptedJsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ of this software and associated documentation files (the "Software"), to deal
*/
public class EncryptedJsonDeserializer extends JsonDeserializer<Object> implements ContextualDeserializer {
private final EncryptionService service;
private final JsonDeserializer<Object> baseDeserializer;
private final JsonDeserializer<?> baseDeserializer;
private final BeanProperty property;

public EncryptedJsonDeserializer(final EncryptionService service, final JsonDeserializer<Object> baseDeserializer) {
public EncryptedJsonDeserializer(final EncryptionService service, final JsonDeserializer<?> baseDeserializer) {
this.service = service;
this.baseDeserializer = baseDeserializer;
this.property = null;
}

public EncryptedJsonDeserializer(final EncryptionService service, final JsonDeserializer<Object> wrapped, final BeanProperty property) {
public EncryptedJsonDeserializer(final EncryptionService service, final JsonDeserializer<?> wrapped, final BeanProperty property) {
this.service = service;
this.baseDeserializer = wrapped;
this.property = property;
Expand All @@ -56,19 +56,20 @@ public EncryptedJsonDeserializer(final EncryptionService service, final JsonDese
* Encrypted field deserializer
*/
@Override
public Object deserialize(final JsonParser parser, final DeserializationContext context) throws JsonMappingException {
JsonDeserializer<?> deserializer = baseDeserializer;
if (deserializer instanceof ContextualDeserializer) {
deserializer = ((ContextualDeserializer) deserializer).createContextual(context, property);
}
return service.decrypt(parser, deserializer, context, null == property ? null : property.getType());
public Object deserialize(final JsonParser parser, final DeserializationContext context) {
return service.decrypt(parser, baseDeserializer, context, property != null ? property.getType() : null);
}

/**
* {@inheritDoc}
*/
@Override
public JsonDeserializer<?> createContextual(final DeserializationContext context, final BeanProperty property) {
return new EncryptedJsonDeserializer(service, baseDeserializer, property);
public JsonDeserializer<?> createContextual(final DeserializationContext context, final BeanProperty property) throws JsonMappingException {
JsonDeserializer<?> deserializer = baseDeserializer;
if (deserializer instanceof ContextualDeserializer) {
deserializer = ((ContextualDeserializer) deserializer).createContextual(context, property);
}

return new EncryptedJsonDeserializer(service, deserializer, property);
}
}