Fixed test cases

Author: henrytao-me

support/src/main/java/com/shopify/graphql/support/Input.java

@@ -21,6 +21,6 @@ public static <T> Input<T> value(@Nullable T value) {
   }
 
   public static <T> Input<T> undefined() {
-    return new Input<>(null, true);
+    return new Input<>(null, false);
   }
 }

support/src/test/java/com/shopify/graphql/support/Generated.java

@@ -12,6 +12,7 @@
 import com.shopify.graphql.support.Query;
 import com.shopify.graphql.support.SchemaViolationError;
 import com.shopify.graphql.support.TopLevelResponse;
+import com.shopify.graphql.support.Input;
 
 import com.shopify.graphql.support.ID;
 
@@ -1076,14 +1077,11 @@ public static class SetIntegerInput implements Serializable {
 
         private int value;
 
-        private LocalDateTime ttl;
-        private boolean ttlSeen = false;
+        private Input<LocalDateTime> ttl = Input.undefined();
 
-        private Boolean negate;
-        private boolean negateSeen = false;
+        private Input<Boolean> negate = Input.undefined();
 
-        private String apiClient;
-        private boolean apiClientSeen = false;
+        private Input<String> apiClient = Input.undefined();
 
         public SetIntegerInput(String key, int value) {
             this.key = key;
@@ -1111,55 +1109,67 @@ public SetIntegerInput setValue(int value) {
 
         @Nullable
         public LocalDateTime getTtl() {
+            return ttl.value;
+        }
+
+        public Input<LocalDateTime> getTtlInput() {
             return ttl;
         }
 
         public SetIntegerInput setTtl(@Nullable LocalDateTime ttl) {
-            this.ttl = ttl;
-            this.ttlSeen = true;
+            this.ttl = Input.value(ttl);
             return this;
         }
 
-        // Unsets the ttl property so that it is not serialized.
-        public SetIntegerInput unsetTtl() {
-            this.ttl = null;
-            this.ttlSeen = false;
+        public SetIntegerInput setTtlInput(@Nullable Input<LocalDateTime> ttl) {
+            if (ttl == null) {
+                throw new IllegalArgumentException("Input can not be null");
+            }
+            this.ttl = ttl;
             return this;
         }
 
         @Nullable
         public Boolean getNegate() {
+            return negate.value;
+        }
+
+        public Input<Boolean> getNegateInput() {
             return negate;
         }
 
         public SetIntegerInput setNegate(@Nullable Boolean negate) {
-            this.negate = negate;
-            this.negateSeen = true;
+            this.negate = Input.value(negate);
             return this;
         }
 
-        // Unsets the negate property so that it is not serialized.
-        public SetIntegerInput unsetNegate() {
-            this.negate = null;
-            this.negateSeen = false;
+        public SetIntegerInput setNegateInput(@Nullable Input<Boolean> negate) {
+            if (negate == null) {
+                throw new IllegalArgumentException("Input can not be null");
+            }
+            this.negate = negate;
             return this;
         }
 
         @Nullable
         public String getApiClient() {
+            return apiClient.value;
+        }
+
+        public Input<String> getApiClientInput() {
             return apiClient;
         }
 
         public SetIntegerInput setApiClient(@Nullable String apiClient) {
-            this.apiClient = apiClient;
-            this.apiClientSeen = true;
+            this.apiClient = Input.value(apiClient);
             return this;
         }
 
-        // Unsets the apiClient property so that it is not serialized.
-        public SetIntegerInput unsetApiClient() {
-            this.apiClient = null;
-            this.apiClientSeen = false;
+        public SetIntegerInput setApiClientInput(@Nullable Input<String> apiClient) {
+            if (apiClient == null) {
+                throw new IllegalArgumentException("Input can not be null");
+            }
+            this.apiClient = apiClient;
             return this;
         }
 
@@ -1177,34 +1187,34 @@ public void appendTo(StringBuilder _queryBuilder) {
             _queryBuilder.append("value:");
             _queryBuilder.append(value);
 
-            if (this.ttlSeen) {
+            if (this.ttl.defined || this.ttl.value != null) {
                 _queryBuilder.append(separator);
                 separator = ",";
                 _queryBuilder.append("ttl:");
-                if (ttl != null) {
-                    Query.appendQuotedString(_queryBuilder, ttl.toString());
+                if (ttl.value != null) {
+                    Query.appendQuotedString(_queryBuilder, ttl.value.toString());
                 } else {
                     _queryBuilder.append("null");
                 }
             }
 
-            if (this.negateSeen) {
+            if (this.negate.defined || this.negate.value != null) {
                 _queryBuilder.append(separator);
                 separator = ",";
                 _queryBuilder.append("negate:");
-                if (negate != null) {
-                    _queryBuilder.append(negate);
+                if (negate.value != null) {
+                    _queryBuilder.append(negate.value);
                 } else {
                     _queryBuilder.append("null");
                 }
             }
 
-            if (this.apiClientSeen) {
+            if (this.apiClient.defined || this.apiClient.value != null) {
                 _queryBuilder.append(separator);
                 separator = ",";
                 _queryBuilder.append("api_client:");
-                if (apiClient != null) {
-                    Query.appendQuotedString(_queryBuilder, apiClient.toString());
+                if (apiClient.value != null) {
+                    Query.appendQuotedString(_queryBuilder, apiClient.value.toString());
                 } else {
                     _queryBuilder.append("null");
                 }

support/src/test/java/com/shopify/graphql/support/GeneratedMinimal.java

@@ -12,6 +12,7 @@
 import com.shopify.graphql.support.Query;
 import com.shopify.graphql.support.SchemaViolationError;
 import com.shopify.graphql.support.TopLevelResponse;
+import com.shopify.graphql.support.Input;
 
 import com.shopify.graphql.support.ID;
 

support/src/test/java/com/shopify/graphql/support/IntegrationTest.java

@@ -1,5 +1,6 @@
 package com.shopify.graphql.support;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
@@ -168,7 +169,7 @@ public void testOptionalFieldOnInput() throws Exception {
     @Test
     public void testUnsetOptionalFieldOnInput() throws Exception {
         String queryString = Generated.mutation(mutation -> mutation
-            .setInteger(new Generated.SetIntegerInput("answer", 42).setTtl(null).unsetTtl())
+            .setInteger(new Generated.SetIntegerInput("answer", 42).setTtlInput(Input.<LocalDateTime>undefined()))
         ).toString();
         assertEquals("mutation{set_integer(input:{key:\"answer\",value:42})}", queryString);
     }