Merge pull request #64 from lucaspouzac/master

Fix #63: Revert back expansion of NON_EMPTY handling (Jackson 2.7.x)
FasterXML · Jan 17, 2016 · 0f168c8 · 0f168c8
2 parents 662e907 + 4cbd8c0
commit 0f168c8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 35 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/module/afterburner/ser/BooleanFieldPropertyWriter.java b/src/main/java/com/fasterxml/jackson/module/afterburner/ser/BooleanFieldPropertyWriter.java
@@ -17,10 +17,7 @@ public BooleanFieldPropertyWriter(BeanPropertyWriter src, BeanPropertyAccessor a
  JsonSerializer<Object> ser) {
  super(src, acc, index, ser);
 
- if (MARKER_FOR_EMPTY == _suppressableValue) {
- _suppressableBoolean = false;
- _suppressableSet = true;
- } else if (_suppressableValue instanceof Boolean) {
+ if (_suppressableValue instanceof Boolean) {
  _suppressableBoolean = ((Boolean)_suppressableValue).booleanValue();
  _suppressableSet = true;
  } else {

diff --git a/src/main/java/com/fasterxml/jackson/module/afterburner/ser/BooleanMethodPropertyWriter.java b/src/main/java/com/fasterxml/jackson/module/afterburner/ser/BooleanMethodPropertyWriter.java
@@ -17,10 +17,7 @@ public BooleanMethodPropertyWriter(BeanPropertyWriter src, BeanPropertyAccessor
  JsonSerializer<Object> ser) {
  super(src, acc, index, ser);
 
- if (MARKER_FOR_EMPTY == _suppressableValue) {
- _suppressableBoolean = false;
- _suppressableSet = true;
- } else if (_suppressableValue instanceof Boolean) {
+ if (_suppressableValue instanceof Boolean) {
  _suppressableBoolean = ((Boolean)_suppressableValue).booleanValue();
  _suppressableSet = true;
  } else {

diff --git a/src/main/java/com/fasterxml/jackson/module/afterburner/ser/IntFieldPropertyWriter.java b/src/main/java/com/fasterxml/jackson/module/afterburner/ser/IntFieldPropertyWriter.java
@@ -17,10 +17,7 @@ public IntFieldPropertyWriter(BeanPropertyWriter src, BeanPropertyAccessor acc,
  JsonSerializer<Object> ser) {
  super(src, acc, index, ser);
 
- if (MARKER_FOR_EMPTY == _suppressableValue) {
- _suppressableInt = 0;
- _suppressableIntSet = true;
- } else if (_suppressableValue instanceof Integer) {
+ if (_suppressableValue instanceof Integer) {
  _suppressableInt = ((Integer)_suppressableValue).intValue();
  _suppressableIntSet = true;
  } else {

diff --git a/src/main/java/com/fasterxml/jackson/module/afterburner/ser/IntMethodPropertyWriter.java b/src/main/java/com/fasterxml/jackson/module/afterburner/ser/IntMethodPropertyWriter.java
@@ -17,10 +17,7 @@ public IntMethodPropertyWriter(BeanPropertyWriter src, BeanPropertyAccessor acc,
  JsonSerializer<Object> ser) {
  super(src, acc, index, ser);
 
- if (MARKER_FOR_EMPTY == _suppressableValue) {
- _suppressableInt = 0;
- _suppressableIntSet = true;
- } else if (_suppressableValue instanceof Integer) {
+ if (_suppressableValue instanceof Integer) {
  _suppressableInt = (Integer)_suppressableValue;
  _suppressableIntSet = true;
  } else {

diff --git a/src/main/java/com/fasterxml/jackson/module/afterburner/ser/LongFieldPropertyWriter.java b/src/main/java/com/fasterxml/jackson/module/afterburner/ser/LongFieldPropertyWriter.java
@@ -17,10 +17,7 @@ public LongFieldPropertyWriter(BeanPropertyWriter src, BeanPropertyAccessor acc,
  JsonSerializer<Object> ser) {
  super(src, acc, index, ser);
 
- if (MARKER_FOR_EMPTY == _suppressableValue) {
- _suppressableLong = 0L;
- _suppressableLongSet = true;
- } else if (_suppressableValue instanceof Long) {
+ if (_suppressableValue instanceof Long) {
  _suppressableLong = (Long)_suppressableValue;
  _suppressableLongSet = true;
  } else {

diff --git a/src/main/java/com/fasterxml/jackson/module/afterburner/ser/LongMethodPropertyWriter.java b/src/main/java/com/fasterxml/jackson/module/afterburner/ser/LongMethodPropertyWriter.java
@@ -17,10 +17,7 @@ public LongMethodPropertyWriter(BeanPropertyWriter src, BeanPropertyAccessor acc
  JsonSerializer<Object> ser) {
  super(src, acc, index, ser);
 
- if (MARKER_FOR_EMPTY == _suppressableValue) {
- _suppressableLong = 0L;
- _suppressableLongSet = true;
- } else if (_suppressableValue instanceof Long) {
+ if (_suppressableValue instanceof Long) {
  _suppressableLong = (Long)_suppressableValue;
  _suppressableLongSet = true;
  } else {

diff --git a/src/test/java/com/fasterxml/jackson/module/afterburner/ser/TestInclusionAnnotations.java b/src/test/java/com/fasterxml/jackson/module/afterburner/ser/TestInclusionAnnotations.java
@@ -77,12 +77,7 @@ public void testEmptyExclusion() throws Exception
  {
  ObjectMapper mapper = mapperWithModule();
  String json;
-
- json = mapper.writeValueAsString(new NonEmptyIntWrapper(3));
- assertEquals("{\"value\":3}", json);
- json = mapper.writeValueAsString(new NonEmptyIntWrapper(0));
- assertEquals("{}", json);
-
+
  json = mapper.writeValueAsString(new NonEmptyStringWrapper("x"));
  assertEquals("{\"value\":\"x\"}", json);
  json = mapper.writeValueAsString(new NonEmptyStringWrapper(""));
@@ -95,11 +90,6 @@ public void testEmptyExclusionViaClass() throws Exception
  {
  ObjectMapper mapper = mapperWithModule();
 
- assertEquals("{\"value\":3}",
- mapper.writeValueAsString(new NonEmptyIntWrapper2(3)));
- assertEquals("{}",
- mapper.writeValueAsString(new NonEmptyIntWrapper2(0)));
-
  assertEquals("{\"value\":\"x\"}",
  mapper.writeValueAsString(new NonEmptyStringWrapper2("x")));
  assertEquals("{}",