Removes JsonSchemaFactory

spacether · spacether · commit 2df82854ac56 · 2023-12-15T16:00:21.000-08:00
diff --git a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES
@@ -214,7 +214,6 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenList.ja
 src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenMap.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
-src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaFactory.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordEntry.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java
@@ -41,7 +41,7 @@ public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetada
                     validationMetadata.validatedPathToSchemas(),
                     validationMetadata.seenClasses()
             );
-            JsonSchema addPropsSchema = JsonSchemaFactory.getInstance(additionalProperties);
+            JsonSchema addPropsSchema = JsonSchema.getInstance(additionalProperties);
             if (propValidationMetadata.validationRanEarlier(addPropsSchema)) {
                 // todo add_deeper_validated_schemas
                 continue;
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java
@@ -18,7 +18,7 @@ public Object getConstraint() {
     public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         for(Class<? extends JsonSchema> allOfClass: allOf) {
-            JsonSchema allOfSchema = JsonSchemaFactory.getInstance(allOfClass);
+            JsonSchema allOfSchema = JsonSchema.getInstance(allOfClass);
             PathToSchemasMap otherPathToSchemas = JsonSchema.validate(allOfSchema, arg, validationMetadata);
             pathToSchemas.update(otherPathToSchemas);
         }
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java
@@ -31,7 +31,7 @@ public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetada
                 continue;
             }
             try {
-                JsonSchema anyOfSchema = JsonSchemaFactory.getInstance(anyOfClass);
+                JsonSchema anyOfSchema = JsonSchema.getInstance(anyOfClass);
                 PathToSchemasMap otherPathToSchemas = JsonSchema.validate(anyOfSchema, arg, validationMetadata);
                 validatedAnyOfClasses.add(anyOfClass);
                 pathToSchemas.update(otherPathToSchemas);
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenList.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenList.java
@@ -27,3 +27,4 @@ public int size() {
         return list.size();
     }
 }
+
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenMap.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FrozenMap.java
@@ -38,3 +38,4 @@ public Set<Entry<String, V>> entrySet() {
         return map.entrySet();
     }
 }
+
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java
@@ -33,7 +33,7 @@ public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetada
                     validationMetadata.validatedPathToSchemas(),
                     validationMetadata.seenClasses()
             );
-            JsonSchema itemsSchema = JsonSchemaFactory.getInstance(items);
+            JsonSchema itemsSchema = JsonSchema.getInstance(items);
             if (itemValidationMetadata.validationRanEarlier(itemsSchema)) {
                 // todo add_deeper_validated_schemas
                 i +=1;
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
@@ -3,10 +3,13 @@
 import org.openapijsonschematools.client.exceptions.ValidationException;
 import org.openapijsonschematools.client.exceptions.InvalidTypeException;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -41,6 +44,23 @@ public abstract class JsonSchema {
     public final Set<Object> enumValues;
     public final Pattern pattern;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
+    private static final Map<Class<? extends JsonSchema>, JsonSchema> classToInstance = new HashMap();
+    public static final synchronized <V extends JsonSchema> V getInstance(Class<V> schemaCls) {
+        if (classToInstance.containsKey(schemaCls)) {
+            JsonSchema inst = classToInstance.get(schemaCls);
+            assert schemaCls.isInstance(inst);
+            return schemaCls.cast(inst);
+        }
+        try {
+            Constructor<V> constructor =  schemaCls.getDeclaredConstructor();
+            constructor.setAccessible(true);
+            V inst = constructor.newInstance();
+            classToInstance.put(schemaCls, inst);
+            return inst;
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
         LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>();
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaFactory.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaFactory.java
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java
@@ -25,7 +25,7 @@ public Object getConstraint() {
     public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         PathToSchemasMap pathToSchemas;
         try {
-            JsonSchema notSchema = JsonSchemaFactory.getInstance(not);
+            JsonSchema notSchema = JsonSchema.getInstance(not);
             pathToSchemas = JsonSchema.validate(notSchema, arg, validationMetadata);
         } catch (ValidationException e) {
             return null;
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java
@@ -31,7 +31,7 @@ public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetada
                 continue;
             }
             try {
-                JsonSchema oneOfSchema = JsonSchemaFactory.getInstance(oneOfClass);
+                JsonSchema oneOfSchema = JsonSchema.getInstance(oneOfClass);
                 PathToSchemasMap otherPathToSchemas = JsonSchema.validate(oneOfSchema, arg, validationMetadata);
                 validatedOneOfClasses.add(oneOfClass);
                 pathToSchemas.update(otherPathToSchemas);
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidator.java
@@ -38,7 +38,7 @@ public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetada
                     validationMetadata.seenClasses()
             );
             Class<? extends JsonSchema> propClass = properties.get(propName);
-            JsonSchema propSchema = JsonSchemaFactory.getInstance(propClass);
+            JsonSchema propSchema = JsonSchema.getInstance(propClass);
             if (propValidationMetadata.validationRanEarlier(propSchema)) {
                 // todo add_deeper_validated_schemas
                 continue;
diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidatorTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidatorTest.java
@@ -71,7 +71,7 @@ public void testCorrectPropertySucceeds() {
         expectedPathToItem.add("args[0]");
         expectedPathToItem.add("someAddProp");
         LinkedHashMap<JsonSchema, Void> expectedClasses = new LinkedHashMap<>();
-        StringJsonSchema schema = JsonSchemaFactory.getInstance(StringJsonSchema.class);
+        StringJsonSchema schema = JsonSchema.getInstance(StringJsonSchema.class);
         expectedClasses.put(schema, null);
         PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap();
         expectedPathToSchemas.put(expectedPathToItem, expectedClasses);
diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/ItemsValidatorTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/ItemsValidatorTest.java
@@ -38,7 +38,7 @@ public void testCorrectItemsSucceeds() {
         expectedPathToItem.add("args[0]");
         expectedPathToItem.add(0);
         LinkedHashMap<JsonSchema, Void> expectedClasses = new LinkedHashMap<>();
-        StringJsonSchema schema = JsonSchemaFactory.getInstance(StringJsonSchema.class);
+        StringJsonSchema schema = JsonSchema.getInstance(StringJsonSchema.class);
         expectedClasses.put(schema, null);
         PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap();
         expectedPathToSchemas.put(expectedPathToItem, expectedClasses);
diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaTest.java
@@ -49,7 +49,7 @@ public void testValidateSucceeds() {
                 new PathToSchemasMap(),
                 new LinkedHashSet<>()
         );
-        SomeSchema schema = JsonSchemaFactory.getInstance(SomeSchema.class);
+        SomeSchema schema = JsonSchema.getInstance(SomeSchema.class);
         PathToSchemasMap pathToSchemas = JsonSchema.validate(
                 schema,
                 "hi",
diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidatorTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidatorTest.java
@@ -41,7 +41,7 @@ public void testCorrectPropertySucceeds() {
         expectedPathToItem.add("args[0]");
         expectedPathToItem.add("someString");
         LinkedHashMap<JsonSchema, Void> expectedClasses = new LinkedHashMap<>();
-        expectedClasses.put(JsonSchemaFactory.getInstance(StringJsonSchema.class), null);
+        expectedClasses.put(JsonSchema.getInstance(StringJsonSchema.class), null);
         PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap();
         expectedPathToSchemas.put(expectedPathToItem, expectedClasses);
         Assert.assertEquals(pathToSchemas, expectedPathToSchemas);
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
@@ -398,7 +398,6 @@ public void processOpts() {
         keywordValidatorFiles.add("FrozenMap");
         keywordValidatorFiles.add("ItemsValidator");
         keywordValidatorFiles.add("JsonSchema");
-        keywordValidatorFiles.add("JsonSchemaFactory");
         keywordValidatorFiles.add("JsonSchemaInfo");
         keywordValidatorFiles.add("KeywordEntry");
         keywordValidatorFiles.add("KeywordValidator");
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/AdditionalPropertiesValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/AdditionalPropertiesValidator.hbs
@@ -41,7 +41,7 @@ public class AdditionalPropertiesValidator implements KeywordValidator {
                     validationMetadata.validatedPathToSchemas(),
                     validationMetadata.seenClasses()
             );
-            JsonSchema addPropsSchema = JsonSchemaFactory.getInstance(additionalProperties);
+            JsonSchema addPropsSchema = JsonSchema.getInstance(additionalProperties);
             if (propValidationMetadata.validationRanEarlier(addPropsSchema)) {
                 // todo add_deeper_validated_schemas
                 continue;
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/AllOfValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/AllOfValidator.hbs
@@ -18,7 +18,7 @@ public class AllOfValidator implements KeywordValidator {
     public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         for(Class<? extends JsonSchema> allOfClass: allOf) {
-            JsonSchema allOfSchema = JsonSchemaFactory.getInstance(allOfClass);
+            JsonSchema allOfSchema = JsonSchema.getInstance(allOfClass);
             PathToSchemasMap otherPathToSchemas = JsonSchema.validate(allOfSchema, arg, validationMetadata);
             pathToSchemas.update(otherPathToSchemas);
         }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/AnyOfValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/AnyOfValidator.hbs
@@ -31,7 +31,7 @@ public class AnyOfValidator implements KeywordValidator {
                 continue;
             }
             try {
-                JsonSchema anyOfSchema = JsonSchemaFactory.getInstance(anyOfClass);
+                JsonSchema anyOfSchema = JsonSchema.getInstance(anyOfClass);
                 PathToSchemasMap otherPathToSchemas = JsonSchema.validate(anyOfSchema, arg, validationMetadata);
                 validatedAnyOfClasses.add(anyOfClass);
                 pathToSchemas.update(otherPathToSchemas);
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ItemsValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ItemsValidator.hbs
@@ -33,7 +33,7 @@ public class ItemsValidator implements KeywordValidator {
                     validationMetadata.validatedPathToSchemas(),
                     validationMetadata.seenClasses()
             );
-            JsonSchema itemsSchema = JsonSchemaFactory.getInstance(items);
+            JsonSchema itemsSchema = JsonSchema.getInstance(items);
             if (itemValidationMetadata.validationRanEarlier(itemsSchema)) {
                 // todo add_deeper_validated_schemas
                 i +=1;
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchema.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchema.hbs
@@ -3,10 +3,13 @@ package {{{packageName}}}.schemas.validation;
 import {{{packageName}}}.exceptions.ValidationException;
 import {{{packageName}}}.exceptions.InvalidTypeException;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -41,6 +44,23 @@ public abstract class JsonSchema {
     public final Set<Object> enumValues;
     public final Pattern pattern;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
+    private static final Map<Class<? extends JsonSchema>, JsonSchema> classToInstance = new HashMap();
+    public static final synchronized <V extends JsonSchema> V getInstance(Class<V> schemaCls) {
+        if (classToInstance.containsKey(schemaCls)) {
+            JsonSchema inst = classToInstance.get(schemaCls);
+            assert schemaCls.isInstance(inst);
+            return schemaCls.cast(inst);
+        }
+        try {
+            Constructor<V> constructor =  schemaCls.getDeclaredConstructor();
+            V inst = constructor.newInstance();
+            constructor.setAccessible(true);
+            classToInstance.put(schemaCls, inst);
+            return inst;
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
         LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>();
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchemaFactory.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchemaFactory.hbs
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/NotValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/NotValidator.hbs
@@ -25,7 +25,7 @@ public class NotValidator implements KeywordValidator {
     public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         PathToSchemasMap pathToSchemas;
         try {
-            JsonSchema notSchema = JsonSchemaFactory.getInstance(not);
+            JsonSchema notSchema = JsonSchema.getInstance(not);
             pathToSchemas = JsonSchema.validate(notSchema, arg, validationMetadata);
         } catch (ValidationException e) {
             return null;
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/OneOfValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/OneOfValidator.hbs
@@ -31,7 +31,7 @@ public class OneOfValidator implements KeywordValidator {
                 continue;
             }
             try {
-                JsonSchema oneOfSchema = JsonSchemaFactory.getInstance(oneOfClass);
+                JsonSchema oneOfSchema = JsonSchema.getInstance(oneOfClass);
                 PathToSchemasMap otherPathToSchemas = JsonSchema.validate(oneOfSchema, arg, validationMetadata);
                 validatedOneOfClasses.add(oneOfClass);
                 pathToSchemas.update(otherPathToSchemas);
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/PropertiesValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/PropertiesValidator.hbs
@@ -38,7 +38,7 @@ public class PropertiesValidator implements KeywordValidator {
                     validationMetadata.seenClasses()
             );
             Class<? extends JsonSchema> propClass = properties.get(propName);
-            JsonSchema propSchema = JsonSchemaFactory.getInstance(propClass);
+            JsonSchema propSchema = JsonSchema.getInstance(propClass);
             if (propValidationMetadata.validationRanEarlier(propSchema)) {
                 // todo add_deeper_validated_schemas
                 continue;
diff --git a/src/main/resources/java/src/test/java/packagename/schemas/validation/AdditionalPropertiesValidatorTest.hbs b/src/main/resources/java/src/test/java/packagename/schemas/validation/AdditionalPropertiesValidatorTest.hbs
@@ -71,7 +71,7 @@ public class AdditionalPropertiesValidatorTest {
         expectedPathToItem.add("args[0]");
         expectedPathToItem.add("someAddProp");
         LinkedHashMap<JsonSchema, Void> expectedClasses = new LinkedHashMap<>();
-        StringJsonSchema schema = JsonSchemaFactory.getInstance(StringJsonSchema.class);
+        StringJsonSchema schema = JsonSchema.getInstance(StringJsonSchema.class);
         expectedClasses.put(schema, null);
         PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap();
         expectedPathToSchemas.put(expectedPathToItem, expectedClasses);
diff --git a/src/main/resources/java/src/test/java/packagename/schemas/validation/ItemsValidatorTest.hbs b/src/main/resources/java/src/test/java/packagename/schemas/validation/ItemsValidatorTest.hbs
@@ -38,7 +38,7 @@ public class ItemsValidatorTest {
         expectedPathToItem.add("args[0]");
         expectedPathToItem.add(0);
         LinkedHashMap<JsonSchema, Void> expectedClasses = new LinkedHashMap<>();
-        StringJsonSchema schema = JsonSchemaFactory.getInstance(StringJsonSchema.class);
+        StringJsonSchema schema = JsonSchema.getInstance(StringJsonSchema.class);
         expectedClasses.put(schema, null);
         PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap();
         expectedPathToSchemas.put(expectedPathToItem, expectedClasses);
diff --git a/src/main/resources/java/src/test/java/packagename/schemas/validation/JsonSchemaTest.hbs b/src/main/resources/java/src/test/java/packagename/schemas/validation/JsonSchemaTest.hbs
@@ -49,7 +49,7 @@ public class JsonSchemaTest {
                 new PathToSchemasMap(),
                 new LinkedHashSet<>()
         );
-        SomeSchema schema = JsonSchemaFactory.getInstance(SomeSchema.class);
+        SomeSchema schema = JsonSchema.getInstance(SomeSchema.class);
         PathToSchemasMap pathToSchemas = JsonSchema.validate(
                 schema,
                 "hi",
diff --git a/src/main/resources/java/src/test/java/packagename/schemas/validation/PropertiesValidatorTest.hbs b/src/main/resources/java/src/test/java/packagename/schemas/validation/PropertiesValidatorTest.hbs
@@ -41,7 +41,7 @@ public class PropertiesValidatorTest {
         expectedPathToItem.add("args[0]");
         expectedPathToItem.add("someString");
         LinkedHashMap<JsonSchema, Void> expectedClasses = new LinkedHashMap<>();
-        expectedClasses.put(JsonSchemaFactory.getInstance(StringJsonSchema.class), null);
+        expectedClasses.put(JsonSchema.getInstance(StringJsonSchema.class), null);
         PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap();
         expectedPathToSchemas.put(expectedPathToItem, expectedClasses);
         Assert.assertEquals(pathToSchemas, expectedPathToSchemas);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public Object getConstraint() {`
`18`	`18`	`public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {`
`19`	`19`	`PathToSchemasMap pathToSchemas = new PathToSchemasMap();`
`20`	`20`	`for(Class<? extends JsonSchema> allOfClass: allOf) {`
`21`		`- JsonSchema allOfSchema = JsonSchemaFactory.getInstance(allOfClass);`
	`21`	`+ JsonSchema allOfSchema = JsonSchema.getInstance(allOfClass);`
`22`	`22`	`PathToSchemasMap otherPathToSchemas = JsonSchema.validate(allOfSchema, arg, validationMetadata);`
`23`	`23`	`pathToSchemas.update(otherPathToSchemas);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetada`
`31`	`31`	`continue;`
`32`	`32`	`}`
`33`	`33`	`try {`
`34`		`- JsonSchema anyOfSchema = JsonSchemaFactory.getInstance(anyOfClass);`
	`34`	`+ JsonSchema anyOfSchema = JsonSchema.getInstance(anyOfClass);`
`35`	`35`	`PathToSchemasMap otherPathToSchemas = JsonSchema.validate(anyOfSchema, arg, validationMetadata);`
`36`	`36`	`validatedAnyOfClasses.add(anyOfClass);`
`37`	`37`	`pathToSchemas.update(otherPathToSchemas);`
Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,4 @@ public int size() {`
`27`	`27`	`return list.size();`
`28`	`28`	`}`
`29`	`29`	`}`
	`30`	`+`
Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,4 @@ public Set<Entry<String, V>> entrySet() {`
`38`	`38`	`return map.entrySet();`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+`