Skip to content

Fix for issue 3481 #3486

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 1 commit into from
Jun 20, 2022
Merged

Fix for issue 3481 #3486

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
5 changes: 4 additions & 1 deletion src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,10 @@ public void serializeAsField(Object bean, JsonGenerator gen,
: _accessorMethod.invoke(bean, (Object[]) null);

// Null handling is bit different, check that first
if (value == null) {
if (value == null ) {
if(_suppressableValue != null && _suppressableValue.equals(value)) {
return;
}
if (_nullSerializer != null) {
gen.writeFieldName(_name);
_nullSerializer.serialize(null, gen, prov);
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,6 @@ protected BeanPropertyWriter buildWriter(SerializerProvider prov,
break;
case CUSTOM: // new with 2.9
valueToSuppress = prov.includeFilterInstance(propDef, inclV.getValueFilter());
if (valueToSuppress == null) { // is this legal?
suppressNulls = true;
} else {
suppressNulls = prov.includeFilterSuppressNulls(valueToSuppress);
}
break;
case NON_NULL:
suppressNulls = true;
Expand Down
19 changes: 7 additions & 12 deletions src/test/java/com/fasterxml/jackson/databind/ser/filter/JsonIncludeCustomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import com.fasterxml.jackson.annotation.*;

import com.fasterxml.jackson.databind.BaseMapTest;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;

// Tests for [databind#888]
public class JsonIncludeCustomTest extends BaseMapTest
Expand Down Expand Up @@ -110,16 +110,12 @@ public void testRepeatedCalls() throws Exception

assertEquals(a2q("{'value':'x'}"),
MAPPER.writeValueAsString(new CountingFooBean("x")));
assertEquals(1, CountingFooFilter.counter.get());

// 06-May-2022, tatu: Maybe surprisingly, we get TWO calls; first one to
// see if `null`s are to be filtered, second time for "real" call
assertEquals(2, CountingFooFilter.counter.get());
assertEquals("{}", MAPPER.writeValueAsString(new CountingFooBean("foo")));
assertEquals(2, CountingFooFilter.counter.get());

// but beyond initial extra call, as expected
assertEquals(3, CountingFooFilter.counter.get());

// except filter will NOT be called again for `null`s, as per [databind#3481]
// except filter will be called again for `null`s, as per [databind#3481]
assertEquals(a2q("{'value':null}"), MAPPER.writeValueAsString(new CountingFooBean(null)));
assertEquals(3, CountingFooFilter.counter.get());
}
Expand All @@ -133,11 +129,10 @@ public void testRepeatedCalls() throws Exception
public void testBrokenFilter() throws Exception
{
try {
String json = MAPPER.writeValueAsString(new BrokenBean("foo"));
String json = MAPPER.writeValueAsString(new BrokenBean(null));
fail("Should not pass, produced: "+json);
} catch (InvalidDefinitionException e) {
verifyException(e, "Problem determining whether filter of type");
verifyException(e, "filter out `null`");
} catch (JsonMappingException e) {
verifyException(e, "while trying to invoke the method java.lang.Object.toString() of a null object loaded from local variable 'other'");
}
}
}