openapi-json-schema-tools · spacether · Dec 15, 2023 · Dec 15, 2023 · Dec 15, 2023 · Dec 15, 2023
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
@@ -203,6 +203,7 @@ src/main/java/org/openapijsonschematools/client/schemas/UuidJsonSchema.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/BooleanSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/CustomIsoparser.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java
@@ -218,6 +219,8 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInf
 src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordEntry.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/LengthValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/ListSchemaValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/MapSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MaxItemsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MaxLengthValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MaxPropertiesValidator.java
@@ -228,18 +231,15 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/MinProperties
 src/main/java/org/openapijsonschematools/client/schemas/validation/MinimumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MultipleOfValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/NullSchemaValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/NumberSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/PathToSchemasMap.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/PatternValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/PropertyEntry.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/RequiredValidator.java
-src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaBooleanValidator.java
-src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaListValidator.java
-src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaMapValidator.java
-src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaNullValidator.java
-src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaNumberValidator.java
-src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaStringValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/StringSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/TypeValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/UniqueItemsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/UnsetAnyTypeJsonSchema.java

diff --git a/...tools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java b/...tools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java
@@ -17,9 +17,9 @@
 import org.openapijsonschematools.client.schemas.validation.FrozenMap;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
+import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
 import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
-import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
 import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
 
 public class AdditionalpropertiesAllowsASchemaWhichShouldValidate {
@@ -70,7 +70,7 @@ public static class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapInput
     }
 
 
-    public static class AdditionalpropertiesAllowsASchemaWhichShouldValidate1 extends JsonSchema implements SchemaMapValidator<Object, Object, AdditionalpropertiesAllowsASchemaWhichShouldValidateMap> {
+    public static class AdditionalpropertiesAllowsASchemaWhichShouldValidate1 extends JsonSchema implements MapSchemaValidator<Object, Object, AdditionalpropertiesAllowsASchemaWhichShouldValidateMap> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

diff --git a/...apijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java b/...apijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java
@@ -15,18 +15,18 @@
 import org.openapijsonschematools.client.exceptions.InvalidTypeException;
 import org.openapijsonschematools.client.exceptions.ValidationException;
 import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.FrozenList;
 import org.openapijsonschematools.client.schemas.validation.FrozenMap;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
+import org.openapijsonschematools.client.schemas.validation.ListSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.NullSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
 import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
-import org.openapijsonschematools.client.schemas.validation.SchemaBooleanValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaListValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaNullValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaNumberValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaStringValidator;
+import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
 
 public class AdditionalpropertiesAreAllowedByDefault {
@@ -75,7 +75,7 @@ public static class AdditionalpropertiesAreAllowedByDefaultMapInput {
     }
 
 
-    public static class AdditionalpropertiesAreAllowedByDefault1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, AdditionalpropertiesAreAllowedByDefaultMap> {
+    public static class AdditionalpropertiesAreAllowedByDefault1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, AdditionalpropertiesAreAllowedByDefaultMap> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

diff --git a/...penapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java b/...penapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java
@@ -16,8 +16,8 @@
 import org.openapijsonschematools.client.schemas.validation.FrozenMap;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
+import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
-import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
 import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
 
 public class AdditionalpropertiesCanExistByItself {
@@ -47,7 +47,7 @@ public static class AdditionalpropertiesCanExistByItselfMapInput {
     }
 
 
-    public static class AdditionalpropertiesCanExistByItself1 extends JsonSchema implements SchemaMapValidator<Boolean, Boolean, AdditionalpropertiesCanExistByItselfMap> {
+    public static class AdditionalpropertiesCanExistByItself1 extends JsonSchema implements MapSchemaValidator<Boolean, Boolean, AdditionalpropertiesCanExistByItselfMap> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

diff --git a/...schematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java b/...schematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java
@@ -17,18 +17,18 @@
 import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
 import org.openapijsonschematools.client.schemas.BooleanJsonSchema;
 import org.openapijsonschematools.client.schemas.validation.AdditionalPropertiesValidator;
+import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.FrozenList;
 import org.openapijsonschematools.client.schemas.validation.FrozenMap;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
+import org.openapijsonschematools.client.schemas.validation.ListSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.NullSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
 import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
-import org.openapijsonschematools.client.schemas.validation.SchemaBooleanValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaListValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaNullValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaNumberValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaStringValidator;
+import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
 
 public class AdditionalpropertiesShouldNotLookInApplicators {
@@ -70,7 +70,7 @@ public static class Schema0MapInput {
     }
 
 
-    public static class Schema0 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, Schema0Map> {
+    public static class Schema0 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, Schema0Map> {
         private static Schema0 instance;
 
         protected Schema0() {
@@ -316,7 +316,7 @@ public static class AdditionalpropertiesShouldNotLookInApplicatorsMapInput {
     }
 
 
-    public static class AdditionalpropertiesShouldNotLookInApplicators1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Boolean, Boolean, AdditionalpropertiesShouldNotLookInApplicatorsMap> {
+    public static class AdditionalpropertiesShouldNotLookInApplicators1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Boolean, Boolean, AdditionalpropertiesShouldNotLookInApplicatorsMap> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

diff --git a/...t_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java b/...t_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java
@@ -16,18 +16,18 @@
 import org.openapijsonschematools.client.exceptions.ValidationException;
 import org.openapijsonschematools.client.schemas.IntJsonSchema;
 import org.openapijsonschematools.client.schemas.StringJsonSchema;
+import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.FrozenList;
 import org.openapijsonschematools.client.schemas.validation.FrozenMap;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
+import org.openapijsonschematools.client.schemas.validation.ListSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.NullSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
 import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
-import org.openapijsonschematools.client.schemas.validation.SchemaBooleanValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaListValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaNullValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaNumberValidator;
-import org.openapijsonschematools.client.schemas.validation.SchemaStringValidator;
+import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
 import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
 
 public class Allof {
@@ -64,7 +64,7 @@ public static class Schema0MapInput {
     }
 
 
-    public static class Schema0 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, Schema0Map> {
+    public static class Schema0 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, Schema0Map> {
         private static Schema0 instance;
 
         protected Schema0() {
@@ -323,7 +323,7 @@ public static class Schema1MapInput {
     }
 
 
-    public static class Schema1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, Schema1Map> {
+    public static class Schema1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, Schema1Map> {
         private static Schema1 instance;
 
         protected Schema1() {
@@ -552,7 +552,7 @@ public Object getNewInstance(Object arg, List<Object> pathToItem, PathToSchemasM
         }
     }    
 
-    public static class Allof1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, FrozenMap<Object>> {
+    public static class Allof1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, FrozenMap<Object>> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator