support excludeFieldsWithoutExposeAnnotation

taowen · taowen · commit 0a7fc3bc90e2 · 2017-06-03T15:34:23.000+08:00
diff --git a/src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java b/src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java
@@ -11,7 +11,26 @@
 
 public class GsonCompatibilityMode extends JsoniterAnnotationSupport {
 
-    private final static GsonCompatibilityMode INSTANCE = new GsonCompatibilityMode();
+    private Builder builder;
+
+    private GsonCompatibilityMode(Builder builder) {
+        this.builder = builder;
+    }
+
+    public static class Builder {
+        private boolean excludeFieldsWithoutExposeAnnotation = false;
+
+        public Builder excludeFieldsWithoutExposeAnnotation() {
+            excludeFieldsWithoutExposeAnnotation = true;
+            return this;
+        }
+
+        public GsonCompatibilityMode build() {
+            return new GsonCompatibilityMode(this);
+        }
+    }
+
+    private final static GsonCompatibilityMode INSTANCE = new GsonCompatibilityMode(new Builder());
 
     public static void enable() {
         JsoniterSpi.registerExtension(INSTANCE);
@@ -116,24 +135,42 @@ protected JsonIgnore getJsonIgnore(Annotation[] annotations) {
         }
         final Expose gsonObj = getAnnotation(
                 annotations, Expose.class);
-        if (gsonObj == null) {
-            return null;
+        if (gsonObj != null) {
+            return new JsonIgnore() {
+                @Override
+                public boolean ignoreDecoding() {
+                    return !gsonObj.deserialize();
+                }
+
+                @Override
+                public boolean ignoreEncoding() {
+                    return !gsonObj.serialize();
+                }
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return JsonIgnore.class;
+                }
+            };
         }
-        return new JsonIgnore() {
-            @Override
-            public boolean ignoreDecoding() {
-                return !gsonObj.deserialize();
-            }
-
-            @Override
-            public boolean ignoreEncoding() {
-                return !gsonObj.serialize();
-            }
-
-            @Override
-            public Class<? extends Annotation> annotationType() {
-                return JsonIgnore.class;
-            }
-        };
+        if (builder.excludeFieldsWithoutExposeAnnotation) {
+            return new JsonIgnore() {
+                @Override
+                public boolean ignoreDecoding() {
+                    return true;
+                }
+
+                @Override
+                public boolean ignoreEncoding() {
+                    return true;
+                }
+
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return JsonIgnore.class;
+                }
+            };
+        }
+        return null;
     }
 }
diff --git a/src/test/java/com/jsoniter/output/TestGson.java b/src/test/java/com/jsoniter/output/TestGson.java
@@ -5,16 +5,20 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.jsoniter.extra.GsonCompatibilityMode;
+import com.jsoniter.spi.JsoniterSpi;
 import junit.framework.TestCase;
 
 public class TestGson extends TestCase {
 
+    private GsonCompatibilityMode gsonCompatibilityMode;
+
     public void setUp() {
-        GsonCompatibilityMode.enable();
+        gsonCompatibilityMode = new GsonCompatibilityMode.Builder().build();
+        JsoniterSpi.registerExtension(gsonCompatibilityMode);
     }
 
     public void tearDown() {
-        GsonCompatibilityMode.disable();
+        JsoniterSpi.deregisterExtension(gsonCompatibilityMode);
     }
 
     public static class TestObject1 {
@@ -61,4 +65,23 @@ public void test_getter_should_be_ignored() {
         output = JsonStream.serialize(obj);
         assertEquals("{}", output);
     }
+
+    public static class TestObject4 {
+        public String field1;
+    }
+
+    public void test_excludeFieldsWithoutExposeAnnotation() {
+        Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+        TestObject4 obj = new TestObject4();
+        obj.field1 = "hello";
+        String output = gson.toJson(obj);
+        assertEquals("{}", output);
+
+        JsoniterSpi.deregisterExtension(gsonCompatibilityMode);
+        gsonCompatibilityMode = new GsonCompatibilityMode.Builder()
+                .excludeFieldsWithoutExposeAnnotation().build();
+        JsoniterSpi.registerExtension(gsonCompatibilityMode);
+        output = JsonStream.serialize(obj);
+        assertEquals("{}", output);
+    }
 }
