Java, adjusts KeywordValidator validate inputs (#335)

* Adusts interface, validators and tests

* Fixes templates

* Fixes java tests

* Fixes java tests

* Samples regen

Author: spacether

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java

@@ -20,17 +20,18 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         if (!(arg instanceof Map)) {
             return null;
         }
         Map<String, Object> castArg = (Map<String, Object>) arg;
-        Map<String, Class<JsonSchema>> properties = (Map<String, Class<JsonSchema>>) extra;
-        if (properties == null) {
-            properties = new LinkedHashMap<>();
-        }
         Set<String> presentAdditionalProperties = new LinkedHashSet<>(castArg.keySet());
-        presentAdditionalProperties.removeAll(properties.keySet());
+        if (schema.keywordToValidator != null) {
+            KeywordValidator propertiesValidator = schema.keywordToValidator.get("properties");
+            if (propertiesValidator instanceof PropertiesValidator) {
+                presentAdditionalProperties.removeAll(((PropertiesValidator) propertiesValidator).properties.keySet());
+            }
+        }
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         // todo add handling for validatedPatternProperties
         for(String addPropName: presentAdditionalProperties) {

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java

@@ -15,7 +15,7 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         for(Class<? extends JsonSchema> allOfClass: allOf) {
             JsonSchema allOfSchema = JsonSchemaFactory.getInstance(allOfClass);

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java

@@ -18,13 +18,13 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         List<Class<? extends JsonSchema>> validatedAnyOfClasses = new ArrayList<>();
         for(Class<? extends JsonSchema> anyOfClass: anyOf) {
-            if (anyOfClass == cls) {
+            if (anyOfClass == schema.getClass()) {
                 /*
-                optimistically assume that cls schema will pass validation
+                optimistically assume that schema will pass validation
                 do not invoke _validate on it because that is recursive
                 */
                 validatedAnyOfClasses.add(anyOfClass);
@@ -40,7 +40,7 @@ public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, Va
             }
         }
         if (validatedAnyOfClasses.isEmpty()) {
-            throw new ValidationException("Invalid inputs given to generate an instance of "+cls+". None "+
+            throw new ValidationException("Invalid inputs given to generate an instance of "+schema.getClass()+". None "+
                     "of the anyOf schemas matched the input data."
             );
         }

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java

@@ -18,7 +18,7 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         if (enumValues.isEmpty()) {
             throw new ValidationException("No value can match enum because enum is empty");
         }

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java

@@ -16,7 +16,7 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         if (!(arg instanceof Number)) {
             return null;
         }

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java

@@ -16,7 +16,7 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         if (!(arg instanceof Number)) {
             return null;
         }

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FakeValidator.java

@@ -7,7 +7,7 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         return null;
     }
 }

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FormatValidator.java

@@ -147,7 +147,7 @@ private Void validateStringFormat(String arg, ValidationMetadata validationMetad
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         if (arg instanceof Number) {
             validateNumericFormat(
                 (Number) arg,

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ItemsValidator.java

@@ -16,7 +16,7 @@ public Object getConstraint() {
     }
 
     @Override
-    public PathToSchemasMap validate(Class<? extends JsonSchema> cls, Object arg, ValidationMetadata validationMetadata, Object extra) {
+    public PathToSchemasMap validate(JsonSchema schema, Object arg, ValidationMetadata validationMetadata) {
         if (!(arg instanceof List)) {
             return null;
         }

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java

@@ -37,15 +37,11 @@ public static PathToSchemasMap validate(
                 if (disabledKeywords.contains(jsonKeyword)) {
                    continue;
                 }
-                if (jsonKeyword.equals("additionalProperties") && thisKeywordToValidator.containsKey("properties")) {
-                    extra = thisKeywordToValidator.get("properties").getConstraint();
-                }
                 KeywordValidator validator = entry.getValue();
                 PathToSchemasMap otherPathToSchemas = validator.validate(
-                        jsonSchema.getClass(),
+                        jsonSchema,
                         arg,
-                        validationMetadata,
-                        extra
+                        validationMetadata
                 );
                 if (otherPathToSchemas == null) {
                     continue;