minor cleanup of #62 and some more unittests

Author: erosb

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

@@ -224,8 +224,8 @@ private CombinedSchema.Builder buildAnyOfSchemaForMultipleTypes() {
         JSONArray subtypeJsons = ls.schemaJson.getJSONArray("type");
         Collection<Schema> subschemas = new ArrayList<>(subtypeJsons.length());
         for (int i = 0; i < subtypeJsons.length(); ++i) {
-            Object subtypeJson = subtypeJsons.get(i);
-            Schema.Builder<?> schemaBuilder = loadForExplicitType((String) subtypeJson);
+            String subtypeJson = subtypeJsons.getString(i);
+            Schema.Builder<?> schemaBuilder = loadForExplicitType(subtypeJson);
             subschemas.add(schemaBuilder.build());
         }
         return CombinedSchema.anyOf(subschemas);

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

@@ -138,6 +138,22 @@ public void multipleTypes() {
         assertTrue(SchemaLoader.load(get("multipleTypes")) instanceof CombinedSchema);
     }
 
+    @Test
+    public void implicitAnyOfLoadsTypeProps() {
+        CombinedSchema schema = (CombinedSchema) SchemaLoader.load(get("multipleTypesWithProps"));
+        StringSchema stringSchema = schema.getSubschemas().stream()
+                .filter(sub -> sub instanceof StringSchema)
+                .map(sub -> (StringSchema) sub)
+                .findFirst().orElseThrow(() -> new AssertionError("no StringSchema"));
+        NumberSchema numSchema = schema.getSubschemas().stream()
+                .filter(sub -> sub instanceof NumberSchema)
+                .map(sub -> (NumberSchema) sub)
+                .findFirst()
+                .orElseThrow(() -> new AssertionError("no NumberSchema"));
+        assertEquals(3, stringSchema.getMinLength().intValue());
+        assertEquals(5, numSchema.getMinimum().intValue());
+    }
+
     @Test
     public void neverMatchingAnyOf() {
         assertTrue(SchemaLoader.load(get("anyOfNeverMatches")) instanceof CombinedSchema);
@@ -297,4 +313,5 @@ public void withoutFragmentNoFragment() {
         String actual = ReferenceLookup.withoutFragment("http://example.com").toString();
         assertEquals("http://example.com", actual);
     }
+
 }

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

@@ -192,6 +192,11 @@
       "boolean"
     ]
   },
+  "multipleTypesWithProps" : {
+    "type" : ["number", "string"],
+    "minLength" : 3,
+    "minimum" : 5
+  },
   "invalidType": {
     "type": {}
   },