changed loading process so that if nullableSupport is on, then every schema is non-nullable by default

Author: erosb

core/src/main/java/org/everit/json/schema/Schema.java

@@ -164,15 +164,16 @@ public boolean equals(Object o) {
                     Objects.equals(title, schema.title) &&
                     Objects.equals(defaultValue, schema.defaultValue) &&
                     Objects.equals(description, schema.description) &&
-                    Objects.equals(id, schema.id);
+                    Objects.equals(id, schema.id) &&
+                    Objects.equals(nullable, schema.nullable);
         } else {
             return false;
         }
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(title, description, id, defaultValue);
+        return Objects.hash(title, description, id, defaultValue, nullable);
     }
 
     public String getTitle() {

core/src/main/java/org/everit/json/schema/loader/SchemaLoader.java

@@ -369,17 +369,24 @@ private Schema.Builder loadSchemaObject(JsonObject o) {
                         }
                     });
         }
+        loadCommonSchemaProperties(builder);
+        return builder;
+    }
+
+    private void loadCommonSchemaProperties(Schema.Builder builder) {
         ls.schemaJson().maybe(config.specVersion.idKeyword()).map(JsonValue::requireString).ifPresent(builder::id);
         ls.schemaJson().maybe("title").map(JsonValue::requireString).ifPresent(builder::title);
         ls.schemaJson().maybe("description").map(JsonValue::requireString).ifPresent(builder::description);
         if (config.nullableSupport) {
-            ls.schemaJson().maybe("nullable").map(JsonValue::requireBoolean).ifPresent(builder::nullable);
+            builder.nullable(ls.schemaJson()
+                    .maybe("nullable")
+                    .map(JsonValue::requireBoolean)
+                    .orElse(Boolean.FALSE));
         }
         if (config.useDefaults) {
             ls.schemaJson().maybe("default").map(JsonValue::deepToOrgJson).ifPresent(builder::defaultValue);
         }
         builder.schemaLocation(new JSONPointer(ls.pointerToCurrentObj).toURIFragment());
-        return builder;
     }
 
     /**

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -589,19 +589,23 @@ public void nullableBooleansAre_Loaded_withNullableSupport() {
                 .build();
         ObjectSchema actual = (ObjectSchema) loader.load().build();
         Schema nullableSchema = actual.getPropertySchemas().get("isNullable");
-        Schema nonNulableSchema = actual.getPropertySchemas().get("nonNullable");
+        Schema nonNullableSchema = actual.getPropertySchemas().get("nonNullable");
+        Schema implicitNonNullable = actual.getPropertySchemas().get("implicitNonNullable");
 
         assertTrue(nullableSchema.isNullable());
-        assertFalse(nonNulableSchema.isNullable());
+        assertFalse(nonNullableSchema.isNullable());
+        assertFalse(implicitNonNullable.isNullable());
     }
 
     @Test
     public void nullableBooleansAre_NotLoaded_withoutNullableSupport() {
         ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("nullableSupport"));
         Schema nullableSchema = actual.getPropertySchemas().get("isNullable");
-        Schema nonNulableSchema = actual.getPropertySchemas().get("nonNullable");
+        Schema nonNullableSchema = actual.getPropertySchemas().get("nonNullable");
+        Schema implicitNonNullable = actual.getPropertySchemas().get("implicitNonNullable");
 
         assertNull(nullableSchema.isNullable());
-        assertNull(nonNulableSchema.isNullable());
+        assertNull(nonNullableSchema.isNullable());
+        assertNull(implicitNonNullable.isNullable());
     }
 }

core/src/test/resources/org/everit/jsonvalidator/testschemas.json

@@ -597,6 +597,9 @@
       "isNullable": {
         "type": "string",
         "nullable": true
+      },
+      "implicitNonNullable": {
+        "type": "string"
       }
     }
   }