support @JsonIgnore for jackson

taowen · taowen · commit fd3994beae63 · 2017-06-03T13:51:09.000+08:00
diff --git a/src/test/java/com/jsoniter/TestAnnotation.java b/src/test/java/com/jsoniter/TestAnnotation.java
@@ -28,17 +28,6 @@ public void tearDown() {
         JsoniterAnnotationSupport.disable();
     }
 
-    public static class TestObject1 {
-        @JsonIgnore
-        public int field2;
-    }
-
-    public void test_ignore() throws IOException {
-        JsonIterator iter = JsonIterator.parse("{'field2': 100}".replace('\'', '"'));
-        TestObject1 obj = iter.read(TestObject1.class);
-        assertEquals(0, obj.field2);
-    }
-
     public static class TestObject2 {
         private int field1;
 
diff --git a/src/test/java/com/jsoniter/TestAnnotationJsonIgnore.java b/src/test/java/com/jsoniter/TestAnnotationJsonIgnore.java
@@ -0,0 +1,29 @@
+package com.jsoniter;
+
+import com.jsoniter.annotation.JsonIgnore;
+import com.jsoniter.annotation.JsoniterAnnotationSupport;
+import junit.framework.TestCase;
+
+import java.io.IOException;
+
+public class TestAnnotationJsonIgnore  extends TestCase {
+
+    public void setUp() {
+        JsoniterAnnotationSupport.enable();
+    }
+
+    public void tearDown() {
+        JsoniterAnnotationSupport.disable();
+    }
+
+    public static class TestObject1 {
+        @JsonIgnore
+        public int field2;
+    }
+
+    public void test_ignore() throws IOException {
+        JsonIterator iter = JsonIterator.parse("{'field2': 100}".replace('\'', '"'));
+        TestObject1 obj = iter.read(TestObject1.class);
+        assertEquals(0, obj.field2);
+    }
+}
diff --git a/src/test/java/com/jsoniter/TestJackson.java b/src/test/java/com/jsoniter/TestJackson.java
@@ -1,9 +1,13 @@
 package com.jsoniter;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.jsoniter.annotation.JacksonAnnotationSupport;
+import com.jsoniter.output.JsonStream;
 import junit.framework.TestCase;
 
 import java.io.IOException;
@@ -59,4 +63,16 @@ public void test_JsonProperty() throws IOException {
         obj = JsonIterator.deserialize("{\"field-1\":\"hello\"}", TestObject2.class);
         assertEquals("hello", obj.field1);
     }
+
+    public static class TestObject3 {
+        @JsonIgnore
+        public String field1;
+    }
+
+    public void test_JsonIgnore() throws IOException {
+        TestObject3 obj = objectMapper.readValue("{\"field1\":\"hello\"}", TestObject3.class);
+        assertNull(obj.field1);
+        obj = JsonIterator.deserialize("{\"field1\":\"hello\"}", TestObject3.class);
+        assertNull(obj.field1);
+    }
 }
diff --git a/src/test/java/com/jsoniter/output/TestAnnotationJsonIgnore.java b/src/test/java/com/jsoniter/output/TestAnnotationJsonIgnore.java
@@ -0,0 +1,37 @@
+package com.jsoniter.output;
+
+import com.jsoniter.annotation.JsonIgnore;
+import com.jsoniter.annotation.JsoniterAnnotationSupport;
+import junit.framework.TestCase;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class TestAnnotationJsonIgnore extends TestCase {
+
+    private ByteArrayOutputStream baos;
+    private JsonStream stream;
+
+    public void setUp() {
+        JsoniterAnnotationSupport.enable();
+        baos = new ByteArrayOutputStream();
+        stream = new JsonStream(baos, 4096);
+    }
+
+    public void tearDown() {
+        JsoniterAnnotationSupport.disable();
+    }
+
+    public static class TestObject1 {
+        @JsonIgnore
+        public int field1;
+    }
+
+    public void test_ignore() throws IOException {
+        TestObject1 obj = new TestObject1();
+        obj.field1 = 100;
+        stream.writeVal(obj);
+        stream.close();
+        assertEquals("{}", baos.toString());
+    }
+}
diff --git a/src/test/java/com/jsoniter/output/TestGenerics.java b/src/test/java/com/jsoniter/output/TestGenerics.java
@@ -1,13 +1,12 @@
 package com.jsoniter.output;
 
-import com.jsoniter.annotation.JsonIgnore;
 import com.jsoniter.annotation.JsoniterAnnotationSupport;
 import junit.framework.TestCase;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-public class TestAnnotation extends TestCase {
+public class TestGenerics extends TestCase {
     static {
 //        JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
     }
@@ -25,33 +24,6 @@ public void tearDown() {
         JsoniterAnnotationSupport.disable();
     }
 
-    public static class TestObject3 {
-        @JsonIgnore
-        public int field1;
-    }
-
-    public void test_ignore() throws IOException {
-        TestObject3 obj = new TestObject3();
-        obj.field1 = 100;
-        stream.writeVal(obj);
-        stream.close();
-        assertEquals("{}", baos.toString());
-    }
-
-    public static class TestObject4 {
-        public int field1;
-
-        public int getField1() {
-            return field1;
-        }
-    }
-
-    public void test_name_conflict() throws IOException {
-        TestObject4 obj = new TestObject4();
-        stream.writeVal(obj);
-        stream.close();
-        assertEquals("{\"field1\":0}", baos.toString());
-    }
 
     public interface TestObject6Interface<A> {
         A getHello();
diff --git a/src/test/java/com/jsoniter/output/TestJackson.java b/src/test/java/com/jsoniter/output/TestJackson.java
@@ -1,9 +1,11 @@
 package com.jsoniter.output;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.jsoniter.annotation.JacksonAnnotationSupport;
 import junit.framework.TestCase;
 
@@ -52,4 +54,19 @@ public void test_JsonProperty() throws JsonProcessingException {
         output = JsonStream.serialize(obj);
         assertEquals("{\"field-1\":\"hello\"}", output);
     }
+
+    public static class TestObject3 {
+        @JsonIgnore
+        public String field1;
+    }
+
+    public void test_JsonIgnore() throws JsonProcessingException {
+        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+        TestObject3 obj = new TestObject3();
+        obj.field1 = "hello";
+        String output = objectMapper.writeValueAsString(obj);
+        assertEquals("{}", output);
+        output = JsonStream.serialize(obj);
+        assertEquals("{}", output);
+    }
 }
diff --git a/src/test/java/com/jsoniter/output/TestObject.java b/src/test/java/com/jsoniter/output/TestObject.java
@@ -237,4 +237,20 @@ public void test_omit_null() {
         obj.field3 = "hello";
         assertEquals("{\"field3\":\"hello\"}", JsonStream.serialize(obj));
     }
+
+
+    public static class TestObject12 {
+        public int field1;
+
+        public int getField1() {
+            return field1;
+        }
+    }
+
+    public void test_name_conflict() throws IOException {
+        TestObject12 obj = new TestObject12();
+        stream.writeVal(obj);
+        stream.close();
+        assertEquals("{\"field1\":0}", baos.toString());
+    }
 }
diff --git a/src/test/java/com/jsoniter/suite/AllTestCases.java b/src/test/java/com/jsoniter/suite/AllTestCases.java
@@ -11,12 +11,14 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
+        com.jsoniter.TestAnnotationJsonIgnore.class,
+        com.jsoniter.output.TestAnnotationJsonIgnore.class,
         com.jsoniter.TestAnnotationJsonProperty.class,
         com.jsoniter.output.TestAnnotationJsonProperty.class,
         TestAnnotationJsonWrapper.class,
         TestAnnotationJsonUnwrapper.class,
         TestAnnotation.class,
-        com.jsoniter.output.TestAnnotation.class,
+        com.jsoniter.output.TestGenerics.class,
         TestCustomizeType.class, TestDemo.class,
         TestExisting.class, TestGenerics.class, TestGenerics.class, TestIO.class, TestNested.class,
         TestObject.class, TestReadAny.class, TestReflection.class, TestSkip.class, TestSlice.class,
