Java, improves validation

samples/client/3_0_3_unit_test/python/.openapi-generator/FILES

@@ -770,6 +770,7 @@ src/unit_test_api/components/schema/uniqueitems_validation.py
 src/unit_test_api/components/schema/uri_format.py
 src/unit_test_api/components/schema/uri_reference_format.py
 src/unit_test_api/components/schema/uri_template_format.py
+src/unit_test_api/components/schemas/__init__.py
 src/unit_test_api/configurations/__init__.py
 src/unit_test_api/configurations/api_configuration.py
 src/unit_test_api/configurations/schema_configuration.py

samples/client/3_1_0_unit_test/python/.openapi-generator/FILES

@@ -1244,6 +1244,7 @@ src/unit_test_api/components/schema/uri_reference_format.py
 src/unit_test_api/components/schema/uri_template_format.py
 src/unit_test_api/components/schema/uuid_format.py
 src/unit_test_api/components/schema/validate_against_correct_branch_then_vs_else.py
+src/unit_test_api/components/schemas/__init__.py
 src/unit_test_api/configurations/__init__.py
 src/unit_test_api/configurations/api_configuration.py
 src/unit_test_api/configurations/schema_configuration.py

samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schemas/__init__.py

@@ -52,11 +52,19 @@
 from unit_test_api.components.schema.enum_with_false_does_not_match0 import EnumWithFalseDoesNotMatch0
 from unit_test_api.components.schema.enum_with_true_does_not_match1 import EnumWithTrueDoesNotMatch1
 from unit_test_api.components.schema.enums_in_properties import EnumsInProperties
+from unit_test_api.components.schema.exclusivemaximum_validation import ExclusivemaximumValidation
+from unit_test_api.components.schema.exclusiveminimum_validation import ExclusiveminimumValidation
 from unit_test_api.components.schema.float_division_inf import FloatDivisionInf
 from unit_test_api.components.schema.forbidden_property import ForbiddenProperty
 from unit_test_api.components.schema.hostname_format import HostnameFormat
 from unit_test_api.components.schema.idn_email_format import IdnEmailFormat
 from unit_test_api.components.schema.idn_hostname_format import IdnHostnameFormat
+from unit_test_api.components.schema.if_and_else_without_then import IfAndElseWithoutThen
+from unit_test_api.components.schema.if_and_then_without_else import IfAndThenWithoutElse
+from unit_test_api.components.schema.if_appears_at_the_end_when_serialized_keyword_processing_sequence import IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence
+from unit_test_api.components.schema.ignore_else_without_if import IgnoreElseWithoutIf
+from unit_test_api.components.schema.ignore_if_without_then_or_else import IgnoreIfWithoutThenOrElse
+from unit_test_api.components.schema.ignore_then_without_if import IgnoreThenWithoutIf
 from unit_test_api.components.schema.integer_type_matches_integers import IntegerTypeMatchesIntegers
 from unit_test_api.components.schema.ipv4_format import Ipv4Format
 from unit_test_api.components.schema.ipv6_format import Ipv6Format
@@ -87,6 +95,7 @@
 from unit_test_api.components.schema.nested_items import NestedItems
 from unit_test_api.components.schema.nested_oneof_to_check_validation_semantics import NestedOneofToCheckValidationSemantics
 from unit_test_api.components.schema.non_ascii_pattern_with_additionalproperties import NonAsciiPatternWithAdditionalproperties
+from unit_test_api.components.schema.non_interference_across_combined_schemas import NonInterferenceAcrossCombinedSchemas
 from unit_test_api.components.schema._not import _Not
 from unit_test_api.components.schema.not_more_complex_schema import NotMoreComplexSchema
 from unit_test_api.components.schema.not_multiple_types import NotMultipleTypes
@@ -144,3 +153,4 @@
 from unit_test_api.components.schema.uri_reference_format import UriReferenceFormat
 from unit_test_api.components.schema.uri_template_format import UriTemplateFormat
 from unit_test_api.components.schema.uuid_format import UuidFormat
+from unit_test_api.components.schema.validate_against_correct_branch_then_vs_else import ValidateAgainstCorrectBranchThenVsElse

samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/.openapi-generator/FILES

@@ -29,6 +29,7 @@ src/this_package/components/schema/__init__.py
 src/this_package/components/schema/addition_operator.py
 src/this_package/components/schema/operator.py
 src/this_package/components/schema/subtraction_operator.py
+src/this_package/components/schemas/__init__.py
 src/this_package/configurations/__init__.py
 src/this_package/configurations/api_configuration.py
 src/this_package/configurations/schema_configuration.py

samples/client/openapi_features/security/python/.openapi-generator/FILES

@@ -29,6 +29,7 @@ src/this_package/apis/paths/path_with_two_explicit_security.py
 src/this_package/apis/tag_to_api.py
 src/this_package/apis/tags/__init__.py
 src/this_package/apis/tags/default_api.py
+src/this_package/components/schemas/__init__.py
 src/this_package/components/security_schemes/__init__.py
 src/this_package/components/security_schemes/security_scheme_api_key.py
 src/this_package/components/security_schemes/security_scheme_bearer_test.py

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

@@ -23,7 +23,7 @@ src/main/java/org/openapijsonschematools/components/responses/successwithjsonapi
 src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/content/applicationjson/Schema.java
 src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java
 src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesClass.java
-src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesValidator.java
+src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesSchema.java
 src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesWithArrayOfEnums.java
 src/main/java/org/openapijsonschematools/components/schemas/Address.java
 src/main/java/org/openapijsonschematools/components/schemas/Animal.java
@@ -366,9 +366,11 @@ src/main/java/org/openapijsonschematools/schemas/validation/FrozenList.java
 src/main/java/org/openapijsonschematools/schemas/validation/FrozenMap.java
 src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java
 src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/validation/KeywordEntry.java
 src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java
 src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java
 src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java
+src/main/java/org/openapijsonschematools/schemas/validation/PropertyEntry.java
 src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java
 src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java
 src/main/java/org/openapijsonschematools/schemas/validation/UnsetAnyTypeJsonSchema.java

samples/client/petstore/java/README.md

@@ -225,7 +225,7 @@ All URIs are relative to the selected server
 | [Schema200Response1](docs/Model200Response.md) | model with an invalid class name for python, starts with a number |
 | [AbstractStepMessage1](docs/AbstractStepMessage.md) | Abstract Step |
 | [AdditionalPropertiesClass1](docs/AdditionalPropertiesClass.md) | |
-| [AdditionalPropertiesValidator1](docs/AdditionalPropertiesValidator.md) | |
+| [AdditionalPropertiesSchema1](docs/AdditionalPropertiesSchema.md) | |
 | [AdditionalPropertiesWithArrayOfEnums1](docs/AdditionalPropertiesWithArrayOfEnums.md) | |
 | [Address1](docs/Address.md) | |
 | [Animal1](docs/Animal.md) | |

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/userarray/content/applicationjson/Schema.java

@@ -1,11 +1,16 @@
 package org.openapijsonschematools.components.requestbodies.userarray.content.applicationjson;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.openapijsonschematools.components.schemas.User;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
 import org.openapijsonschematools.schemas.validation.FrozenList;
+import org.openapijsonschematools.schemas.validation.ItemsValidator;
 import org.openapijsonschematools.schemas.validation.JsonSchema;
+import org.openapijsonschematools.schemas.validation.KeywordEntry;
+import org.openapijsonschematools.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.schemas.validation.TypeValidator;
 
 public class Schema {
     // nest classes so all schemas and input/output classes can be public
@@ -18,10 +23,10 @@ public static class SchemaList extends FrozenList<Object> {
     }    
 
     public class Schema1 extends JsonSchema {
-        public static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
-            FrozenList.class
+        public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
+            new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
+            new KeywordEntry("items", new ItemsValidator(User.User1.class))
         ));
-        public static final Class<?> items = User.User1.class;
         protected static SchemaList getListOutputInstance(FrozenList<Object> arg) {
             return new SchemaList(arg);
         }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/Headers.java

@@ -1,15 +1,19 @@
 package org.openapijsonschematools.components.responses.headerswithnobody;
-import java.util.AbstractMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import org.openapijsonschematools.components.responses.headerswithnobody.headers.location.LocationSchema;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
 import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
 import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
 import org.openapijsonschematools.schemas.validation.FrozenMap;
 import org.openapijsonschematools.schemas.validation.JsonSchema;
+import org.openapijsonschematools.schemas.validation.KeywordEntry;
+import org.openapijsonschematools.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.schemas.validation.PropertiesValidator;
+import org.openapijsonschematools.schemas.validation.PropertyEntry;
+import org.openapijsonschematools.schemas.validation.TypeValidator;
 
 public class Headers {
     // nest classes so all schemas and input/output classes can be public
@@ -29,13 +33,13 @@ public static HeadersMap of(Map<String, Object> arg, SchemaConfiguration configu
     }    
 
     public class Headers1 extends JsonSchema {
-        public static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
-            FrozenMap.class
+        public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
+            new KeywordEntry("type", new TypeValidator(Set.of(FrozenMap.class))),
+            new KeywordEntry("properties", new PropertiesValidator(Map.ofEntries(
+                new PropertyEntry("location", LocationSchema.LocationSchema1.class)
+            ))),
+            new KeywordEntry("additionalProperties", new AdditionalPropertiesValidator(AdditionalProperties.class))
         ));
-        public static final LinkedHashMap<String, Class<?>> properties = new LinkedHashMap<>(Map.ofEntries(
-            new AbstractMap.SimpleEntry<String, Class<?>>("location", LocationSchema.LocationSchema1.class)
-        ));
-        static final Class<?> additionalProperties = AdditionalProperties.class;
         protected static HeadersMap getMapOutputInstance(FrozenMap<? extends String, ?> arg) {
             return new HeadersMap(arg);
         }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java

@@ -1,12 +1,17 @@
 package org.openapijsonschematools.components.responses.successfulxmlandjsonarrayofpet.content.applicationjson;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.openapijsonschematools.components.schemas.Pet;
 import org.openapijsonschematools.components.schemas.RefPet;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
 import org.openapijsonschematools.schemas.validation.FrozenList;
+import org.openapijsonschematools.schemas.validation.ItemsValidator;
 import org.openapijsonschematools.schemas.validation.JsonSchema;
+import org.openapijsonschematools.schemas.validation.KeywordEntry;
+import org.openapijsonschematools.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.schemas.validation.TypeValidator;
 
 public class Schema {
     // nest classes so all schemas and input/output classes can be public
@@ -19,10 +24,10 @@ public static class SchemaList extends FrozenList<Object> {
     }    
 
     public class Schema1 extends JsonSchema {
-        public static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
-            FrozenList.class
+        public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
+            new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
+            new KeywordEntry("items", new ItemsValidator(RefPet.RefPet1.class))
         ));
-        public static final Class<?> items = RefPet.RefPet1.class;
         protected static SchemaList getListOutputInstance(FrozenList<Object> arg) {
             return new SchemaList(arg);
         }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationxml/Schema.java

@@ -1,11 +1,16 @@
 package org.openapijsonschematools.components.responses.successfulxmlandjsonarrayofpet.content.applicationxml;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.openapijsonschematools.components.schemas.Pet;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
 import org.openapijsonschematools.schemas.validation.FrozenList;
+import org.openapijsonschematools.schemas.validation.ItemsValidator;
 import org.openapijsonschematools.schemas.validation.JsonSchema;
+import org.openapijsonschematools.schemas.validation.KeywordEntry;
+import org.openapijsonschematools.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.schemas.validation.TypeValidator;
 
 public class Schema {
     // nest classes so all schemas and input/output classes can be public
@@ -18,10 +23,10 @@ public static class SchemaList extends FrozenList<Object> {
     }    
 
     public class Schema1 extends JsonSchema {
-        public static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
-            FrozenList.class
+        public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
+            new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
+            new KeywordEntry("items", new ItemsValidator(Pet.Pet1.class))
         ));
-        public static final Class<?> items = Pet.Pet1.class;
         protected static SchemaList getListOutputInstance(FrozenList<Object> arg) {
             return new SchemaList(arg);
         }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java

@@ -1,15 +1,19 @@
 package org.openapijsonschematools.components.responses.successinlinecontentandheader;
-import java.util.AbstractMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import org.openapijsonschematools.components.responses.successinlinecontentandheader.headers.someheader.SomeHeaderSchema;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
 import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
 import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
 import org.openapijsonschematools.schemas.validation.FrozenMap;
 import org.openapijsonschematools.schemas.validation.JsonSchema;
+import org.openapijsonschematools.schemas.validation.KeywordEntry;
+import org.openapijsonschematools.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.schemas.validation.PropertiesValidator;
+import org.openapijsonschematools.schemas.validation.PropertyEntry;
+import org.openapijsonschematools.schemas.validation.TypeValidator;
 
 public class Headers {
     // nest classes so all schemas and input/output classes can be public
@@ -29,13 +33,13 @@ public static HeadersMap of(Map<String, Object> arg, SchemaConfiguration configu
     }    
 
     public class Headers1 extends JsonSchema {
-        public static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
-            FrozenMap.class
+        public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
+            new KeywordEntry("type", new TypeValidator(Set.of(FrozenMap.class))),
+            new KeywordEntry("properties", new PropertiesValidator(Map.ofEntries(
+                new PropertyEntry("someHeader", SomeHeaderSchema.SomeHeaderSchema1.class)
+            ))),
+            new KeywordEntry("additionalProperties", new AdditionalPropertiesValidator(AdditionalProperties.class))
         ));
-        public static final LinkedHashMap<String, Class<?>> properties = new LinkedHashMap<>(Map.ofEntries(
-            new AbstractMap.SimpleEntry<String, Class<?>>("someHeader", SomeHeaderSchema.SomeHeaderSchema1.class)
-        ));
-        static final Class<?> additionalProperties = AdditionalProperties.class;
         protected static HeadersMap getMapOutputInstance(FrozenMap<? extends String, ?> arg) {
             return new HeadersMap(arg);
         }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java

@@ -1,11 +1,15 @@
 package org.openapijsonschematools.components.responses.successinlinecontentandheader.content.applicationjson;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
 import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
 import org.openapijsonschematools.schemas.validation.FrozenMap;
 import org.openapijsonschematools.schemas.validation.JsonSchema;
+import org.openapijsonschematools.schemas.validation.KeywordEntry;
+import org.openapijsonschematools.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.schemas.validation.TypeValidator;
 
 public class Schema {
     // nest classes so all schemas and input/output classes can be public
@@ -24,10 +28,10 @@ public static SchemaMap of(Map<String, Object> arg, SchemaConfiguration configur
     }    
 
     public class Schema1 extends JsonSchema {
-        public static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
-            FrozenMap.class
+        public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
+            new KeywordEntry("type", new TypeValidator(Set.of(FrozenMap.class))),
+            new KeywordEntry("additionalProperties", new AdditionalPropertiesValidator(AdditionalProperties.class))
         ));
-        static final Class<?> additionalProperties = AdditionalProperties.class;
         protected static SchemaMap getMapOutputInstance(FrozenMap<? extends String, ?> arg) {
             return new SchemaMap(arg);
         }