Skip to content

Fix for failing Guava Optional test #136

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

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Fix for failing Guava Optional test #136

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9befff8
Fix for failing Guava Optional test
mukham12 Dec 16, 2023
0d3ec72
Update guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/G…
mukham12 Dec 16, 2023
a36316b
Update GuavaBeanSerializerModifier to only apply recent changes to Op…
mukham12 Dec 18, 2023
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
14 changes: 13 additions & 1 deletion ...a/src/main/java/com/fasterxml/jackson/datatype/guava/ser/GuavaBeanSerializerModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.fasterxml.jackson.datatype.guava.ser;

import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.SerializationConfig;
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
import com.fasterxml.jackson.databind.ser.impl.UnwrappingBeanPropertyWriter;
import com.fasterxml.jackson.databind.util.NameTransformer;
import com.google.common.base.Optional;

import java.io.Serializable;
Expand All @@ -25,7 +29,15 @@ public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
for (int i = 0; i < beanProperties.size(); ++i) {
final BeanPropertyWriter writer = beanProperties.get(i);
if (Optional.class.isAssignableFrom(writer.getType().getRawClass())) {
beanProperties.set(i, new GuavaOptionalBeanPropertyWriter(writer));
// Since 2.17: Added to preserve UnwrappingBeanProperty name transformer.
if (writer instanceof UnwrappingBeanPropertyWriter) {
final AnnotatedMember member = writer.getMember();
final AnnotationIntrospector intr = config.getAnnotationIntrospector();
final NameTransformer unwrapper = intr.findUnwrappingNameTransformer(member);
beanProperties.set(i, new GuavaUnwrappingOptionalBeanPropertyWriter(writer, unwrapper));
} else {
beanProperties.set(i, new GuavaOptionalBeanPropertyWriter(writer));
}
}
}
return beanProperties;
Expand Down