support JsonIgnore

taowen · taowen · commit 33e064a18fef · 2016-12-12T20:49:53.000+08:00
diff --git a/src/main/java/com/jsoniter/annotation/jsoniter/JsonIgnore.java b/src/main/java/com/jsoniter/annotation/jsoniter/JsonIgnore.java
@@ -0,0 +1,13 @@
+package com.jsoniter.annotation.jsoniter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JsonIgnore {
+    String USE_DEFAULT_NAME = "";
+    String value() default USE_DEFAULT_NAME;
+}
diff --git a/src/main/java/com/jsoniter/annotation/jsoniter/JsoniterAnnotationSupport.java b/src/main/java/com/jsoniter/annotation/jsoniter/JsoniterAnnotationSupport.java
@@ -19,15 +19,18 @@ public Decoder createDecoder(final Field field) {
 
     @Override
     public String[] getAlternativeFieldNames(Field field) {
-        JsonProperty annotation = field.getAnnotation(JsonProperty.class);
-        if (annotation == null) {
-            return null;
+        JsonIgnore jsonIgnore = field.getAnnotation(JsonIgnore.class);
+        if (jsonIgnore != null) {
+            return new String[0];
         }
-        String alternativeField = annotation.value();
-        if (alternativeField.equals(JsonProperty.USE_DEFAULT_NAME)) {
-            alternativeField = field.getName();
+        JsonProperty jsonProperty = field.getAnnotation(JsonProperty.class);
+        if (jsonProperty != null) {
+            String alternativeField = jsonProperty.value();
+            if (alternativeField.equals(JsonProperty.USE_DEFAULT_NAME)) {
+                alternativeField = field.getName();
+            }
+            return new String[]{alternativeField};
         }
-        final String[] alternativeFields = new String[]{alternativeField};
-        return alternativeFields;
+        return null;
     }
 }
diff --git a/src/test/java/com/jsoniter/AnnotatedObject.java b/src/test/java/com/jsoniter/AnnotatedObject.java
@@ -1,11 +1,12 @@
 package com.jsoniter;
 
+import com.jsoniter.annotation.jsoniter.JsonIgnore;
 import com.jsoniter.annotation.jsoniter.JsonProperty;
 
 public class AnnotatedObject {
     @JsonProperty("field-1")
     public int field1;
 
-    @JsonProperty("field-2")
+    @JsonIgnore
     public int field2;
 }
diff --git a/src/test/java/com/jsoniter/InheritedObject.java b/src/test/java/com/jsoniter/InheritedObject.java
@@ -0,0 +1,5 @@
+package com.jsoniter;
+
+public class InheritedObject extends SimpleObject {
+    public String inheritedField;
+}
diff --git a/src/test/java/com/jsoniter/TestAnnotation.java b/src/test/java/com/jsoniter/TestAnnotation.java
@@ -6,10 +6,16 @@
 import java.io.IOException;
 
 public class TestAnnotation extends TestCase {
-    public void test() throws IOException {
+    public void test_rename() throws IOException {
         JsoniterAnnotationSupport.enable();
         Jsoniter iter = Jsoniter.parse("{'field-1': 100}".replace('\'', '"'));
         AnnotatedObject obj = iter.read(AnnotatedObject.class);
         assertEquals(100, obj.field1);
     }
+    public void test_ignore() throws IOException {
+        JsoniterAnnotationSupport.enable();
+        Jsoniter iter = Jsoniter.parse("{'field2': 100}".replace('\'', '"'));
+        AnnotatedObject obj = iter.read(AnnotatedObject.class);
+        assertEquals(0, obj.field2);
+    }
 }
diff --git a/src/test/java/com/jsoniter/TestInheritance.java b/src/test/java/com/jsoniter/TestInheritance.java
@@ -0,0 +1,13 @@
+package com.jsoniter;
+
+import junit.framework.TestCase;
+
+import java.io.IOException;
+
+public class TestInheritance extends TestCase {
+    public void test() throws IOException {
+        Jsoniter iter = Jsoniter.parse("{'inheritedField': 'hello'}".replace('\'', '"'));
+        InheritedObject inheritedObject = iter.read(InheritedObject.class);
+        assertEquals("hello", inheritedObject.inheritedField);
+    }
+}
