Refactor Boolean properties to boolean. (#4326)

There is no good reason to use Boolean instead of boolean.
Using Boolean will lead to handling "null" state which is confusing.

This change removes changes the type of Boolean properties to boolean.

modules/swagger-codegen/src/test/java/io/swagger/codegen/csharp/CSharpModelTest.java

@@ -47,7 +47,7 @@ public class CSharpModelTest {
         Assert.assertEquals(property.defaultValue, null);
         Assert.assertEquals(property.baseType, "List");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -70,7 +70,7 @@ public class CSharpModelTest {
         Assert.assertEquals(property.datatype, "Collection<string>");
         Assert.assertEquals(property.baseType, "Collection");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -96,7 +96,7 @@ public class CSharpModelTest {
         Assert.assertEquals(property.baseType, "Collection",
                 "returnICollection option should not modify property baseType");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -153,8 +153,8 @@ public class CSharpModelTest {
         Assert.assertEquals(property3.name, "CreatedAt");
         Assert.assertNull(property3.defaultValue);
         Assert.assertEquals(property3.baseType, "DateTime?");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -191,9 +191,9 @@ public class CSharpModelTest {
         Assert.assertEquals(property2.name, "Urls");
         Assert.assertNull(property2.defaultValue);
         Assert.assertEquals(property2.baseType, "List");
-        Assert.assertNull(property2.hasMore);
+        Assert.assertFalse(property2.hasMore);
         Assert.assertEquals(property2.containerType, "array");
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isPrimitiveType);
         Assert.assertTrue(property2.isContainer);
     }
@@ -219,7 +219,7 @@ public class CSharpModelTest {
         Assert.assertEquals(property1.name, "Translations");
         Assert.assertEquals(property1.baseType, "Dictionary");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
         Assert.assertTrue(property1.isPrimitiveType);
     }
@@ -242,7 +242,7 @@ public class CSharpModelTest {
         Assert.assertEquals(property1.datatype, "Children");
         Assert.assertEquals(property1.name, "Children");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -267,7 +267,7 @@ public class CSharpModelTest {
         Assert.assertEquals(property1.name, "Children");
         Assert.assertEquals(property1.baseType, "List");
         Assert.assertEquals(property1.containerType, "array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -293,9 +293,9 @@ public class CSharpModelTest {
         Assert.assertEquals(property1.name, "Children");
         Assert.assertEquals(property1.baseType, "Dictionary");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
-        Assert.assertNull(property1.isNotContainer);
+        Assert.assertFalse(property1.isNotContainer);
     }
 
     @Test(description = "convert an array model")

modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoModelTest.java

@@ -69,8 +69,8 @@ public class GoModelTest {
         Assert.assertEquals(property3.name, "CreatedAt");
         Assert.assertEquals(property3.defaultValue, "null");
         Assert.assertEquals(property3.baseType, "time.Time");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -106,9 +106,9 @@ public class GoModelTest {
         Assert.assertEquals(property2.datatype, "[]string");
         Assert.assertEquals(property2.name, "Urls");
         Assert.assertEquals(property2.baseType, "array");
-        Assert.assertNull(property2.hasMore);
+        Assert.assertFalse(property2.hasMore);
         Assert.assertEquals(property2.containerType, "array");
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isPrimitiveType);
         Assert.assertTrue(property2.isContainer);
     }
@@ -134,7 +134,7 @@ public class GoModelTest {
         Assert.assertEquals(property1.name, "Translations");
         Assert.assertEquals(property1.baseType, "map");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
         Assert.assertTrue(property1.isPrimitiveType);
     }
@@ -157,7 +157,7 @@ public class GoModelTest {
         Assert.assertEquals(property1.datatype, "Children");
         Assert.assertEquals(property1.name, "Children");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -181,7 +181,7 @@ public class GoModelTest {
         Assert.assertEquals(property1.name, "Children");
         Assert.assertEquals(property1.baseType, "array");
         Assert.assertEquals(property1.containerType, "array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -207,9 +207,9 @@ public class GoModelTest {
         Assert.assertEquals(property1.name, "Children");
         Assert.assertEquals(property1.baseType, "map");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
-        Assert.assertNull(property1.isNotContainer);
+        Assert.assertFalse(property1.isNotContainer);
     }
 
     @Test(description = "convert an array model")

modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java

@@ -81,8 +81,8 @@ public class JavaModelTest {
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
         Assert.assertEquals(property3.baseType, "Date");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -111,7 +111,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.defaultValue, "new ArrayList<String>()");
         Assert.assertEquals(property.baseType, "List");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -139,7 +139,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.defaultValue, "new HashMap<String, String>()");
         Assert.assertEquals(property.baseType, "Map");
         Assert.assertEquals(property.containerType, "map");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -167,7 +167,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.defaultValue, "new HashMap<String, List<Pet>>()");
         Assert.assertEquals(property.baseType, "Map");
         Assert.assertEquals(property.containerType, "map");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -189,7 +189,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.defaultValue, "new ArrayList<List<Pet>>()");
         Assert.assertEquals(property.baseType, "List");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -213,7 +213,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.name, "children");
         Assert.assertEquals(property.defaultValue, "null");
         Assert.assertEquals(property.baseType, "Children");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
 
@@ -240,7 +240,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.defaultValue, "new ArrayList<Children>()");
         Assert.assertEquals(property.baseType, "List");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -268,9 +268,9 @@ public class JavaModelTest {
         Assert.assertEquals(property.defaultValue, "new HashMap<String, Children>()");
         Assert.assertEquals(property.baseType, "Map");
         Assert.assertEquals(property.containerType, "map");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
-        Assert.assertNull(property.isNotContainer);
+        Assert.assertFalse(property.isNotContainer);
 
     }
 
@@ -329,7 +329,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.name, "NAME");
         Assert.assertEquals(property.defaultValue, "null");
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
+        Assert.assertFalse(property.hasMore);
         Assert.assertTrue(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
@@ -355,7 +355,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.name, "pId");
         Assert.assertEquals(property.defaultValue, "null");
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
+        Assert.assertFalse(property.hasMore);
         Assert.assertTrue(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
@@ -381,7 +381,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.name, "atTName");
         Assert.assertEquals(property.defaultValue, "null");
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
+        Assert.assertFalse(property.hasMore);
         Assert.assertTrue(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
@@ -443,8 +443,8 @@ public class JavaModelTest {
         Assert.assertEquals(property.name, "inputBinaryData");
         Assert.assertEquals(property.defaultValue, "null");
         Assert.assertEquals(property.baseType, "byte[]");
-        Assert.assertNull(property.hasMore);
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.hasMore);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
 
@@ -468,7 +468,7 @@ public class JavaModelTest {
         Assert.assertEquals(property.name, "u");
         Assert.assertEquals(property.defaultValue, "null");
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
+        Assert.assertFalse(property.hasMore);
         Assert.assertTrue(property.isNotContainer);
     }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelEnumTest.java

@@ -137,7 +137,7 @@ public class JavaScriptModelEnumTest {
         Assert.assertEquals(prope.datatypeWithEnum, "EnumIntegerEnum");
         Assert.assertEquals(prope.enumName, "EnumIntegerEnum");
         Assert.assertTrue(prope.isEnum);
-        Assert.assertNull(prope.isContainer);
+        Assert.assertFalse(prope.isContainer);
         Assert.assertNull(prope.items);
         Assert.assertEquals(prope.allowableValues.get("values"), Arrays.asList(1, -1));
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/javascript/JavaScriptModelTest.java

@@ -81,8 +81,8 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, null);
         Assert.assertEquals(property3.baseType, "Date");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -112,7 +112,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.defaultValue, /*"[]"*/null);
         Assert.assertEquals(property.baseType, "Array");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -141,7 +141,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.defaultValue, /*"{}"*/null);
         Assert.assertEquals(property.baseType, "Object");
         Assert.assertEquals(property.containerType, "map");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -170,7 +170,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.defaultValue, /*"{}"*/null);
         Assert.assertEquals(property.baseType, "Object");
         Assert.assertEquals(property.containerType, "map");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -193,7 +193,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.defaultValue, /*"[]"*/null);
         Assert.assertEquals(property.baseType, "Array");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -217,7 +217,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.name, "children");
         Assert.assertEquals(property.defaultValue, null);
         Assert.assertEquals(property.baseType, "Children");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
 
@@ -246,7 +246,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.defaultValue, /*"[]"*/null);
         Assert.assertEquals(property.baseType, "Array");
         Assert.assertEquals(property.containerType, "array");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
     }
 
@@ -276,9 +276,9 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.defaultValue, /*"{}"*/ null);
         Assert.assertEquals(property.baseType, "Object");
         Assert.assertEquals(property.containerType, "map");
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isContainer);
-        Assert.assertNull(property.isNotContainer);
+        Assert.assertFalse(property.isNotContainer);
     }
 
     @Test(description = "convert an array model")
@@ -336,7 +336,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.name, "NAME");
         Assert.assertEquals(property.defaultValue, null);
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
+        Assert.assertFalse(property.hasMore);
         Assert.assertTrue(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
@@ -362,7 +362,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.name, "pId");
         Assert.assertEquals(property.defaultValue, null);
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
+        Assert.assertFalse(property.hasMore);
         Assert.assertTrue(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
@@ -424,8 +424,8 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.name, "inputBinaryData");
         Assert.assertEquals(property.defaultValue, null);
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
-        Assert.assertNull(property.required);
+        Assert.assertFalse(property.hasMore);
+        Assert.assertFalse(property.required);
         Assert.assertTrue(property.isNotContainer);
     }
 
@@ -449,7 +449,7 @@ public class JavaScriptModelTest {
         Assert.assertEquals(property.name, "u");
         Assert.assertEquals(property.defaultValue, null);
         Assert.assertEquals(property.baseType, "String");
-        Assert.assertNull(property.hasMore);
+        Assert.assertFalse(property.hasMore);
         Assert.assertTrue(property.isNotContainer);
     }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcModelTest.java

@@ -36,7 +36,7 @@ public class ObjcModelTest {
         Assert.assertEquals(property1.name, "translations");
         Assert.assertEquals(property1.baseType, "NSDictionary");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
     
@@ -87,8 +87,8 @@ public class ObjcModelTest {
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertNull(property3.defaultValue);
         Assert.assertEquals(property3.baseType, "NSDate");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -125,9 +125,9 @@ public class ObjcModelTest {
         Assert.assertEquals(property2.name, "urls");
         Assert.assertNull(property2.defaultValue);
         Assert.assertEquals(property2.baseType, "NSArray");
-        Assert.assertNull(property2.hasMore);
+        Assert.assertFalse(property2.hasMore);
         Assert.assertEquals(property2.containerType, "array");
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isPrimitiveType);
         Assert.assertTrue(property2.isContainer);
     }
@@ -153,7 +153,7 @@ public class ObjcModelTest {
         Assert.assertEquals(property1.name, "translations");
         Assert.assertEquals(property1.baseType, "NSDictionary");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
         Assert.assertTrue(property1.isPrimitiveType);
     }
@@ -177,7 +177,7 @@ public class ObjcModelTest {
         Assert.assertEquals(property1.datatype, "SWGChildren*");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "SWGChildren");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -202,7 +202,7 @@ public class ObjcModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "NSArray");
         Assert.assertEquals(property1.containerType, "array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -228,9 +228,9 @@ public class ObjcModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "NSDictionary");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
-        Assert.assertNull(property1.isNotContainer);
+        Assert.assertFalse(property1.isNotContainer);
     }
 
     @Test(description = "convert an array model")
@@ -299,7 +299,7 @@ public class ObjcModelTest {
         final Model definition = model.getDefinitions().get("AnimalFarm");
         final CodegenModel codegenModel = codegen.fromModel("AnimalFarm",definition);
 
-        Assert.assertEquals(codegenModel.isArrayModel,Boolean.TRUE);
+        Assert.assertEquals(codegenModel.isArrayModel, true);
         Assert.assertEquals(codegenModel.arrayModelType,"SWGAnimal");
     }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/php/PhpModelTest.java

@@ -78,8 +78,8 @@ public class PhpModelTest {
         Assert.assertEquals(property3.name, "created_at");
         Assert.assertEquals(property3.defaultValue, null);
         Assert.assertEquals(property3.baseType, "\\DateTime");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -115,9 +115,9 @@ public class PhpModelTest {
         Assert.assertEquals(property2.datatype, "string[]");
         Assert.assertEquals(property2.name, "urls");
         Assert.assertEquals(property2.baseType, "array");
-        Assert.assertNull(property2.hasMore);
+        Assert.assertFalse(property2.hasMore);
         Assert.assertEquals(property2.containerType, "array");
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isPrimitiveType);
         Assert.assertTrue(property2.isContainer);
     }
@@ -143,7 +143,7 @@ public class PhpModelTest {
         Assert.assertEquals(property1.name, "translations");
         Assert.assertEquals(property1.baseType, "map");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
         Assert.assertTrue(property1.isPrimitiveType);
     }
@@ -166,7 +166,7 @@ public class PhpModelTest {
         Assert.assertEquals(property1.datatype, "\\Swagger\\Client\\Model\\Children");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -190,7 +190,7 @@ public class PhpModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "array");
         Assert.assertEquals(property1.containerType, "array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -217,9 +217,9 @@ public class PhpModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "map");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
-        Assert.assertNull(property1.isNotContainer);
+        Assert.assertFalse(property1.isNotContainer);
     }
 
     @Test(description = "convert an array model")
@@ -320,7 +320,7 @@ public class PhpModelTest {
         Assert.assertEquals(prope.datatypeWithEnum, "ENUM_INTEGER");
         Assert.assertEquals(prope.enumName, "ENUM_INTEGER");
         Assert.assertTrue(prope.isEnum);
-        Assert.assertNull(prope.isContainer);
+        Assert.assertFalse(prope.isContainer);
         Assert.assertNull(prope.items);
         Assert.assertEquals(prope.allowableValues.get("values"), Arrays.asList(1, -1));
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/python/PythonTest.java

@@ -95,8 +95,8 @@ public class PythonTest {
         Assert.assertEquals(property3.name, "created_at");
         Assert.assertNull(property3.defaultValue);
         Assert.assertEquals(property3.baseType, "datetime");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -133,9 +133,9 @@ public class PythonTest {
         Assert.assertEquals(property2.name, "urls");
         Assert.assertNull(property2.defaultValue);
         Assert.assertEquals(property2.baseType, "list");
-        Assert.assertNull(property2.hasMore);
+        Assert.assertFalse(property2.hasMore);
         Assert.assertEquals(property2.containerType, "array");
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isPrimitiveType);
         Assert.assertTrue(property2.isContainer);
     }
@@ -161,7 +161,7 @@ public class PythonTest {
         Assert.assertEquals(property1.name, "translations");
         Assert.assertEquals(property1.baseType, "dict");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
         Assert.assertTrue(property1.isPrimitiveType);
     }
@@ -184,7 +184,7 @@ public class PythonTest {
         Assert.assertEquals(property1.datatype, "Children");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -209,7 +209,7 @@ public class PythonTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "list");
         Assert.assertEquals(property1.containerType, "array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -235,9 +235,9 @@ public class PythonTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "dict");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
-        Assert.assertNull(property1.isNotContainer);
+        Assert.assertFalse(property1.isNotContainer);
     }
 
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/scala/ScalaModelTest.java

@@ -70,8 +70,8 @@ public class ScalaModelTest {
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
         Assert.assertEquals(property3.baseType, "DateTime");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -100,7 +100,7 @@ public class ScalaModelTest {
         Assert.assertEquals(property1.defaultValue, "new ListBuffer[String]() ");
         Assert.assertEquals(property1.baseType, "List");
         Assert.assertEquals(property1.containerType, "array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -128,7 +128,7 @@ public class ScalaModelTest {
         Assert.assertEquals(property1.defaultValue, "new HashMap[String, String]() ");
         Assert.assertEquals(property1.baseType, "Map");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -153,7 +153,7 @@ public class ScalaModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.defaultValue, "null");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -181,7 +181,7 @@ public class ScalaModelTest {
         Assert.assertEquals(property1.defaultValue, "new ListBuffer[Children]() ");
         Assert.assertEquals(property1.baseType, "List");
         Assert.assertEquals(property1.containerType, "array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -210,9 +210,9 @@ public class ScalaModelTest {
         Assert.assertEquals(property1.defaultValue, "new HashMap[String, Children]() ");
         Assert.assertEquals(property1.baseType, "Map");
         Assert.assertEquals(property1.containerType, "map");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
-        Assert.assertNull(property1.isNotContainer);
+        Assert.assertFalse(property1.isNotContainer);
     }
 
     @Test(description = "convert an array model")

modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftModelTest.java

@@ -62,7 +62,7 @@ public class SwiftModelTest {
         Assert.assertNull(property3.defaultValue);
         Assert.assertEquals(property3.baseType, "NSDate");
         Assert.assertTrue(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
 
         final CodegenProperty property4 = cm.vars.get(3);
@@ -72,7 +72,7 @@ public class SwiftModelTest {
         Assert.assertNull(property4.defaultValue);
         Assert.assertEquals(property4.baseType, "NSData");
         Assert.assertTrue(property4.hasMore);
-        Assert.assertNull(property4.required);
+        Assert.assertFalse(property4.required);
         Assert.assertTrue(property4.isNotContainer);
 
         final CodegenProperty property5 = cm.vars.get(4);
@@ -82,7 +82,7 @@ public class SwiftModelTest {
         Assert.assertNull(property5.defaultValue);
         Assert.assertEquals(property5.baseType, "NSData");
         Assert.assertTrue(property5.hasMore);
-        Assert.assertNull(property5.required);
+        Assert.assertFalse(property5.required);
         Assert.assertTrue(property5.isNotContainer);
 
         final CodegenProperty property6 = cm.vars.get(5);
@@ -91,8 +91,8 @@ public class SwiftModelTest {
         Assert.assertEquals(property6.name, "uuid");
         Assert.assertNull(property6.defaultValue);
         Assert.assertEquals(property6.baseType, "NSUUID");
-        Assert.assertNull(property6.hasMore);
-        Assert.assertNull(property6.required);
+        Assert.assertFalse(property6.hasMore);
+        Assert.assertFalse(property6.required);
         Assert.assertTrue(property6.isNotContainer);
     }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/swift3/Swift3ModelTest.java

@@ -64,7 +64,7 @@ public class Swift3ModelTest {
         Assert.assertNull(property3.defaultValue);
         Assert.assertEquals(property3.baseType, "Date");
         Assert.assertTrue(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
 
         final CodegenProperty property4 = cm.vars.get(3);
@@ -74,7 +74,7 @@ public class Swift3ModelTest {
         Assert.assertNull(property4.defaultValue);
         Assert.assertEquals(property4.baseType, "Data");
         Assert.assertTrue(property4.hasMore);
-        Assert.assertNull(property4.required);
+        Assert.assertFalse(property4.required);
         Assert.assertTrue(property4.isNotContainer);
 
         final CodegenProperty property5 = cm.vars.get(4);
@@ -84,7 +84,7 @@ public class Swift3ModelTest {
         Assert.assertNull(property5.defaultValue);
         Assert.assertEquals(property5.baseType, "Data");
         Assert.assertTrue(property5.hasMore);
-        Assert.assertNull(property5.required);
+        Assert.assertFalse(property5.required);
         Assert.assertTrue(property5.isNotContainer);
 
         final CodegenProperty property6 = cm.vars.get(5);
@@ -93,8 +93,8 @@ public class Swift3ModelTest {
         Assert.assertEquals(property6.name, "uuid");
         Assert.assertNull(property6.defaultValue);
         Assert.assertEquals(property6.baseType, "UUID");
-        Assert.assertNull(property6.hasMore);
-        Assert.assertNull(property6.required);
+        Assert.assertFalse(property6.hasMore);
+        Assert.assertFalse(property6.required);
         Assert.assertTrue(property6.isNotContainer);
     }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/fetch/TypeScriptFetchModelTest.java

@@ -70,8 +70,8 @@ public class TypeScriptFetchModelTest {
         Assert.assertEquals(property3.datatype, "Date");
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -105,8 +105,8 @@ public class TypeScriptFetchModelTest {
         Assert.assertEquals(property2.datatype, "Array<string>");
         Assert.assertEquals(property2.name, "urls");
         Assert.assertEquals(property2.baseType, "Array");
-        Assert.assertNull(property2.hasMore);
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.hasMore);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isContainer);
     }
 
@@ -129,7 +129,7 @@ public class TypeScriptFetchModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.defaultValue, "null");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -153,7 +153,7 @@ public class TypeScriptFetchModelTest {
         Assert.assertEquals(property1.datatype, "Array<Children>");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 
@@ -233,7 +233,7 @@ public class TypeScriptFetchModelTest {
         Assert.assertEquals(prope.datatypeWithEnum, "EnumIntegerEnum");
         Assert.assertEquals(prope.enumName, "EnumIntegerEnum");
         Assert.assertTrue(prope.isEnum);
-        Assert.assertNull(prope.isContainer);
+        Assert.assertFalse(prope.isContainer);
         Assert.assertNull(prope.items);
         Assert.assertEquals(prope.allowableValues.get("values"), Arrays.asList(1, -1));
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java

@@ -63,8 +63,8 @@ public class TypeScriptAngularModelTest {
         Assert.assertEquals(property3.datatype, "Date");
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -98,8 +98,8 @@ public class TypeScriptAngularModelTest {
         Assert.assertEquals(property2.datatype, "Array<string>");
         Assert.assertEquals(property2.name, "urls");
         Assert.assertEquals(property2.baseType, "Array");
-        Assert.assertNull(property2.hasMore);
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.hasMore);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isContainer);
     }
 
@@ -122,7 +122,7 @@ public class TypeScriptAngularModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.defaultValue, "null");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -146,7 +146,7 @@ public class TypeScriptAngularModelTest {
         Assert.assertEquals(property1.datatype, "Array<Children>");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java

@@ -64,8 +64,8 @@ public class TypeScriptAngular2ModelTest {
         Assert.assertEquals(property3.datatype, "Date");
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -99,8 +99,8 @@ public class TypeScriptAngular2ModelTest {
         Assert.assertEquals(property2.datatype, "Array<string>");
         Assert.assertEquals(property2.name, "urls");
         Assert.assertEquals(property2.baseType, "Array");
-        Assert.assertNull(property2.hasMore);
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.hasMore);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isContainer);
     }
 
@@ -123,7 +123,7 @@ public class TypeScriptAngular2ModelTest {
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.defaultValue, "null");
         Assert.assertEquals(property1.baseType, "models.Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -147,7 +147,7 @@ public class TypeScriptAngular2ModelTest {
         Assert.assertEquals(property1.datatype, "Array<models.Children>");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java

@@ -63,8 +63,8 @@ public class TypeScriptNodeModelTest {
         Assert.assertEquals(property3.datatype, "Date");
         Assert.assertEquals(property3.name, "createdAt");
         Assert.assertEquals(property3.defaultValue, "null");
-        Assert.assertNull(property3.hasMore);
-        Assert.assertNull(property3.required);
+        Assert.assertFalse(property3.hasMore);
+        Assert.assertFalse(property3.required);
         Assert.assertTrue(property3.isNotContainer);
     }
 
@@ -98,8 +98,8 @@ public class TypeScriptNodeModelTest {
         Assert.assertEquals(property2.datatype, "Array<string>");
         Assert.assertEquals(property2.name, "urls");
         Assert.assertEquals(property2.baseType, "Array");
-        Assert.assertNull(property2.hasMore);
-        Assert.assertNull(property2.required);
+        Assert.assertFalse(property2.hasMore);
+        Assert.assertFalse(property2.required);
         Assert.assertTrue(property2.isContainer);
     }
 
@@ -121,7 +121,7 @@ public class TypeScriptNodeModelTest {
         Assert.assertEquals(property1.datatype, "Children");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Children");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isNotContainer);
     }
 
@@ -145,7 +145,7 @@ public class TypeScriptNodeModelTest {
         Assert.assertEquals(property1.datatype, "Array<Children>");
         Assert.assertEquals(property1.name, "children");
         Assert.assertEquals(property1.baseType, "Array");
-        Assert.assertNull(property1.required);
+        Assert.assertFalse(property1.required);
         Assert.assertTrue(property1.isContainer);
     }