Deprecate ObjectDocument.setNull for set(null) call

kamikat · Sep 9, 2017 · 00ce513 · 00ce513
1 parent 2b413df
commit 00ce513
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/moe/banana/jsonapi2/ObjectDocument.java b/src/main/java/moe/banana/jsonapi2/ObjectDocument.java
@@ -2,9 +2,8 @@
 
 public class ObjectDocument<DATA extends ResourceIdentifier> extends Document<DATA> {
 
-    DATA data = null;
-
-    boolean isExplicitNull;
+    private DATA data = null;
+    private boolean nullFlag;
 
     public ObjectDocument() {
     }
@@ -21,18 +20,20 @@ public void set(DATA data) {
             data.setDocument(this);
         }
         this.data = data;
+        this.nullFlag = data == null;
     }
 
     public DATA get() {
         return data;
     }
 
+    @Deprecated
     public void setNull(boolean isNull) {
-        isExplicitNull = isNull;
+        nullFlag = isNull;
     }
 
     public boolean isNull() {
-        return isExplicitNull;
+        return nullFlag;
     }
 
     @Override
@@ -43,15 +44,15 @@ public boolean equals(Object o) {
 
         ObjectDocument<?> that = (ObjectDocument<?>) o;
 
-        if (isExplicitNull != that.isExplicitNull) return false;
+        if (nullFlag != that.nullFlag) return false;
         return data.equals(that.data);
     }
 
     @Override
     public int hashCode() {
         int result = super.hashCode();
         result = 31 * result + data.hashCode();
-        result = 31 * result + (isExplicitNull ? 1 : 0);
+        result = 31 * result + (nullFlag ? 1 : 0);
         return result;
     }
 }
diff --git a/src/main/java/moe/banana/jsonapi2/ResourceAdapterFactory.java b/src/main/java/moe/banana/jsonapi2/ResourceAdapterFactory.java
@@ -105,7 +105,7 @@ public Document<DATA> fromJson(JsonReader reader) throws IOException {
                         } else if (reader.peek() == JsonReader.Token.NULL) {
                             reader.nextNull();
                             document = document.asObjectDocument();
-                            ((ObjectDocument<DATA>) document).setNull(true);
+                            ((ObjectDocument<DATA>) document).set(null);
                         } else {
                             reader.skipValue();
                         }

diff --git a/src/test/java/moe/banana/jsonapi2/DocumentTest.java b/src/test/java/moe/banana/jsonapi2/DocumentTest.java
@@ -184,7 +184,7 @@ public void deserialize_array_to_array_typed_document() throws Exception {
     public void serialize_null() {
         ObjectDocument document = new ObjectDocument();
         assertThat(getDocumentAdapter(ResourceIdentifier.class).toJson(document), equalTo("{}"));
-        document.setNull(true);
+        document.set(null);
         assertThat(getDocumentAdapter(ResourceIdentifier.class).toJson(document), equalTo("{\"data\":null}"));
     }