Merge pull request #63 from halvorgb/pattern-not-set-for-multiple-types

Failing test case and attempted fix for issue 62

Author: erosb

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

@@ -222,13 +222,11 @@ public SchemaLoader(final SchemaLoaderBuilder builder) {
 
     private CombinedSchema.Builder buildAnyOfSchemaForMultipleTypes() {
         JSONArray subtypeJsons = ls.schemaJson.getJSONArray("type");
-        Map<String, Object> dummyJson = new HashMap<String, Object>();
-        Collection<Schema> subschemas = new ArrayList<Schema>(subtypeJsons.length());
+        Collection<Schema> subschemas = new ArrayList<>(subtypeJsons.length());
         for (int i = 0; i < subtypeJsons.length(); ++i) {
             Object subtypeJson = subtypeJsons.get(i);
-            dummyJson.put("type", subtypeJson);
-            JSONObject child = new JSONObject(dummyJson);
-            subschemas.add(loadChild(child).build());
+            Schema.Builder<?> schemaBuilder = loadForExplicitType((String) subtypeJson);
+            subschemas.add(schemaBuilder.build());
         }
         return CombinedSchema.anyOf(subschemas);
     }

tests/src/test/resources/org/everit/json/schema/issues/issue62/schema.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "only_as_1": {
+      "pattern": "^a+$",
+      "type": ["string", "null"]
+    }
+  }
+}

tests/src/test/resources/org/everit/json/schema/issues/issue62/subject-invalid.json

@@ -0,0 +1,3 @@
+{
+  "only_as_1": "bbb"
+}