fix(modelgen-java): inconsistence of required fields between builder and copy (#416)

Author: AaronZyLee

packages/appsync-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-java-visitor.test.ts.snap

@@ -3802,24 +3802,24 @@ public final class ListContainer implements Model {
   public final class CopyOfBuilder extends Builder {
     private CopyOfBuilder(String id, String name, List<Integer> list, List<String> requiredList, List<StatusEnum> requiredListOfRequired, List<Boolean> listOfRequired, List<Temporal.Date> requiredListOfRequiredDates, List<Double> listOfRequiredFloats, List<CustomType> requiredListOfCustomTypes) {
       super.id(id);
-      super.requiredListOfRequired(requiredListOfRequired)
-        .listOfRequired(listOfRequired)
+      super.requiredList(requiredList)
+        .requiredListOfRequired(requiredListOfRequired)
         .requiredListOfRequiredDates(requiredListOfRequiredDates)
-        .listOfRequiredFloats(listOfRequiredFloats)
+        .requiredListOfCustomTypes(requiredListOfCustomTypes)
         .name(name)
         .list(list)
-        .requiredList(requiredList)
-        .requiredListOfCustomTypes(requiredListOfCustomTypes);
+        .listOfRequired(listOfRequired)
+        .listOfRequiredFloats(listOfRequiredFloats);
     }
     
     @Override
-     public CopyOfBuilder requiredListOfRequired(List<StatusEnum> requiredListOfRequired) {
-      return (CopyOfBuilder) super.requiredListOfRequired(requiredListOfRequired);
+     public CopyOfBuilder requiredList(List<String> requiredList) {
+      return (CopyOfBuilder) super.requiredList(requiredList);
     }
     
     @Override
-     public CopyOfBuilder listOfRequired(List<Boolean> listOfRequired) {
-      return (CopyOfBuilder) super.listOfRequired(listOfRequired);
+     public CopyOfBuilder requiredListOfRequired(List<StatusEnum> requiredListOfRequired) {
+      return (CopyOfBuilder) super.requiredListOfRequired(requiredListOfRequired);
     }
     
     @Override
@@ -3828,8 +3828,8 @@ public final class ListContainer implements Model {
     }
     
     @Override
-     public CopyOfBuilder listOfRequiredFloats(List<Double> listOfRequiredFloats) {
-      return (CopyOfBuilder) super.listOfRequiredFloats(listOfRequiredFloats);
+     public CopyOfBuilder requiredListOfCustomTypes(List<CustomType> requiredListOfCustomTypes) {
+      return (CopyOfBuilder) super.requiredListOfCustomTypes(requiredListOfCustomTypes);
     }
     
     @Override
@@ -3843,13 +3843,13 @@ public final class ListContainer implements Model {
     }
     
     @Override
-     public CopyOfBuilder requiredList(List<String> requiredList) {
-      return (CopyOfBuilder) super.requiredList(requiredList);
+     public CopyOfBuilder listOfRequired(List<Boolean> listOfRequired) {
+      return (CopyOfBuilder) super.listOfRequired(listOfRequired);
     }
     
     @Override
-     public CopyOfBuilder requiredListOfCustomTypes(List<CustomType> requiredListOfCustomTypes) {
-      return (CopyOfBuilder) super.requiredListOfCustomTypes(requiredListOfCustomTypes);
+     public CopyOfBuilder listOfRequiredFloats(List<Double> listOfRequiredFloats) {
+      return (CopyOfBuilder) super.listOfRequiredFloats(listOfRequiredFloats);
     }
   }
   

packages/appsync-modelgen-plugin/src/visitors/appsync-java-visitor.ts

@@ -513,9 +513,9 @@ export class AppSyncModelJavaVisitor<
       .extends(['Builder']);
 
     const nonNullableFields = this.getWritableFields(model)
-      .filter(field => !field.isNullable)
+      .filter(field => this.isRequiredField(field))
       .filter(f => (isModel ? f.name !== 'id' : true));
-    const nullableFields = this.getWritableFields(model).filter(field => field.isNullable);
+    const nullableFields = this.getWritableFields(model).filter(field => !this.isRequiredField(field));
 
     // constructor
     const constructorArguments = this.getWritableFields(model).map(field => ({