Java, adds schema validator test (#272)

* Adds schemavalidator test

* Adds SchemaValidatorTest

Author: spacether

samples/client/petstore/java/.openapi-generator/FILES

@@ -10,4 +10,5 @@ src/main/java/org/openapijsonschematools/schemas/validators/KeywordValidator.jav
 src/main/java/org/openapijsonschematools/schemas/validators/TypeValidator.java
 src/test/java/org/openapijsonschematools/configurations/JsonSchemaKeywordFlagsTest.java
 src/test/java/org/openapijsonschematools/schemas/CustomIsoparserTest.java
+src/test/java/org/openapijsonschematools/schemas/SchemaValidatorTest.java
 src/test/java/org/openapijsonschematools/schemas/validators/TypeValidatorTest.java

samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/SchemaValidator.java

@@ -3,30 +3,31 @@
 import org.openapijsonschematools.schemas.validators.KeywordValidator;
 import org.openapijsonschematools.schemas.validators.TypeValidator;
 
-import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.RecordComponent;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-public class SchemaValidator {
+public interface SchemaValidator {
     static final HashMap<String, KeywordValidator> keywordToValidator = new HashMap(){{
         put("type", new TypeValidator());
     }};
     static PathToSchemasMap _validate(
-            Class<SchemaValidator> cls,
+            SchemaValidator schema,
             Object arg,
             ValidationMetadata validationMetadata
-    ) throws InstantiationException, IllegalAccessException {
-        SchemaValidator clsSchema = cls.newInstance();
-        Field[] fields = cls.getDeclaredFields();
+    ) throws InvocationTargetException, IllegalAccessException {
         HashMap<String, Object> fieldsToValues = new HashMap<>();
         LinkedHashSet<String> disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords();
-        for (Field field : fields) {
-            String fieldName = field.getName();
+        Class<SchemaValidator> schemaCls = (Class<SchemaValidator>) schema.getClass();
+        RecordComponent[] recordComponents = schemaCls.getRecordComponents();
+        for (RecordComponent recordComponent : recordComponents) {
+            String fieldName = recordComponent.getName();
             if (disabledKeywords.contains(fieldName)) {
                 continue;
             }
-            Object value = field.get(clsSchema);
+            Object value = recordComponent.getAccessor().invoke(schema);
             fieldsToValues.put(fieldName, value);
         }
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
@@ -38,7 +39,7 @@ static PathToSchemasMap _validate(
                     arg,
                     value,
                     null,
-                    cls,
+                    schemaCls,
                     validationMetadata
             );
         }

samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/SchemaValidatorTest.java

@@ -0,0 +1,48 @@
+package org.openapijsonschematools.schemas;
+
+import org.junit.Test;
+import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.configurations.SchemaConfiguration;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+
+record SomeSchema(LinkedHashSet<Class<?>> type) implements SchemaValidator {
+    static SomeSchema withDefaults() {
+        LinkedHashSet<Class<?>> type = new LinkedHashSet<>();
+        type.add(String.class);
+        return new SomeSchema(type);
+    }
+
+    static PathToSchemasMap _validate(
+            Object arg,
+            ValidationMetadata validationMetadata
+    ) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+        return SchemaValidator._validate(
+                SomeSchema.withDefaults(),
+                arg,
+                validationMetadata
+        );
+    }
+
+
+}
+
+public class SchemaValidatorTest {
+
+
+    @Test
+    public void testValidateSucceeds() throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+        ValidationMetadata validationMetadata = new ValidationMetadata(
+                new ArrayList<>(),
+                new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()),
+                new PathToSchemasMap(),
+                new LinkedHashSet<>()
+        );
+        SomeSchema._validate(
+                "hi",
+                validationMetadata
+        );
+    }
+}

src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java

@@ -281,6 +281,10 @@ public void processOpts() {
                 "src/main/java/org/openapitools/schemas/SchemaValidator.hbs",
                 packagePath() + File.separatorChar + "schemas",
                 "SchemaValidator.java"));
+        supportingFiles.add(new SupportingFile(
+                "src/test/java/org/openapitools/schemas/SchemaValidatorTest.hbs",
+                testPackagePath() + File.separatorChar + "schemas",
+                "SchemaValidatorTest.java"));
 
         // keyword validators
         supportingFiles.add(new SupportingFile(

src/main/resources/java/src/main/java/org/openapitools/schemas/SchemaValidator.hbs

@@ -3,30 +3,31 @@ package org.openapijsonschematools.schemas;
 import org.openapijsonschematools.schemas.validators.KeywordValidator;
 import org.openapijsonschematools.schemas.validators.TypeValidator;
 
-import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.RecordComponent;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-public class SchemaValidator {
+public interface SchemaValidator {
     static final HashMap<String, KeywordValidator> keywordToValidator = new HashMap()\{{
         put("type", new TypeValidator());
     }};
     static PathToSchemasMap _validate(
-            Class<SchemaValidator> cls,
+            SchemaValidator schema,
             Object arg,
             ValidationMetadata validationMetadata
-    ) throws InstantiationException, IllegalAccessException {
-        SchemaValidator clsSchema = cls.newInstance();
-        Field[] fields = cls.getDeclaredFields();
+    ) throws InvocationTargetException, IllegalAccessException {
         HashMap<String, Object> fieldsToValues = new HashMap<>();
         LinkedHashSet<String> disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords();
-        for (Field field : fields) {
-            String fieldName = field.getName();
+        Class<SchemaValidator> schemaCls = (Class<SchemaValidator>) schema.getClass();
+        RecordComponent[] recordComponents = schemaCls.getRecordComponents();
+        for (RecordComponent recordComponent : recordComponents) {
+            String fieldName = recordComponent.getName();
             if (disabledKeywords.contains(fieldName)) {
                 continue;
             }
-            Object value = field.get(clsSchema);
+            Object value = recordComponent.getAccessor().invoke(schema);
             fieldsToValues.put(fieldName, value);
         }
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
@@ -38,7 +39,7 @@ public class SchemaValidator {
                     arg,
                     value,
                     null,
-                    cls,
+                    schemaCls,
                     validationMetadata
             );
         }

src/main/resources/java/src/test/java/org/openapitools/schemas/SchemaValidatorTest.hbs

@@ -0,0 +1,48 @@
+package {{{packageName}}}.schemas;
+
+import org.junit.Test;
+import {{{packageName}}}.configurations.JsonSchemaKeywordFlags;
+import {{{packageName}}}.configurations.SchemaConfiguration;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+
+record SomeSchema(LinkedHashSet<Class<?>> type) implements SchemaValidator {
+    static SomeSchema withDefaults() {
+        LinkedHashSet<Class<?>> type = new LinkedHashSet<>();
+        type.add(String.class);
+        return new SomeSchema(type);
+    }
+
+    static PathToSchemasMap _validate(
+            Object arg,
+            ValidationMetadata validationMetadata
+    ) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+        return SchemaValidator._validate(
+                SomeSchema.withDefaults(),
+                arg,
+                validationMetadata
+        );
+    }
+
+
+}
+
+public class SchemaValidatorTest {
+
+
+    @Test
+    public void testValidateSucceeds() throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+        ValidationMetadata validationMetadata = new ValidationMetadata(
+                new ArrayList<>(),
+                new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()),
+                new PathToSchemasMap(),
+                new LinkedHashSet<>()
+        );
+        SomeSchema._validate(
+                "hi",
+                validationMetadata
+        );
+    }
+}