From be7ce28120649969eceaaecaa2b2ef2ca065bfaf Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 19 Jan 2024 21:28:38 -0800
Subject: [PATCH 1/8] Adds then validator, partial else validator

---
 .../java/.openapi-generator/FILES             |  2 ++
 .../schemas/validation/ElseValidator.java     | 14 ++++++++
 .../client/schemas/validation/JsonSchema.java | 10 ++++++
 .../schemas/validation/JsonSchemaInfo.java    | 10 ++++++
 .../schemas/validation/ThenValidator.java     | 34 +++++++++++++++++++
 .../generators/JavaClientGenerator.java       |  2 ++
 .../schemas/validation/ElseValidator.hbs      | 14 ++++++++
 .../schemas/validation/JsonSchema.hbs         | 10 ++++++
 .../schemas/validation/JsonSchemaInfo.hbs     | 10 ++++++
 .../schemas/validation/ThenValidator.hbs      | 34 +++++++++++++++++++
 10 files changed, 140 insertions(+)
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
 create mode 100644 src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
 create mode 100644 src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs

diff --git a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
index 55e58d75011..a547e7b664b 100644
--- a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
+++ b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
@@ -305,6 +305,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/DependentRequ
 src/main/java/org/openapijsonschematools/client/schemas/validation/DependentSchemasValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleValueMethod.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java
@@ -356,6 +357,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/RequiredValid
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringValueMethod.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.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/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
new file mode 100644
index 00000000000..08bdd0a1035
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -0,0 +1,14 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+public class ElseValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        // todo
+        return null;
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
index db33a080218..1925008547c 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
@@ -55,6 +55,8 @@ public abstract class JsonSchema {
     public final @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties;
     public final @Nullable List<Class<? extends JsonSchema>> prefixItems;
     public final @Nullable Class<? extends JsonSchema> ifSchema;
+    public final @Nullable Class<? extends JsonSchema> then;
+    public final @Nullable Class<? extends JsonSchema> elseSchema;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -198,6 +200,14 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
         if (this.ifSchema != null) {
             keywordToValidator.put("if", new IfValidator());
         }
+        this.then = jsonSchemaInfo.then;
+        if (this.then != null) {
+            keywordToValidator.put("then", new ThenValidator());
+        }
+        this.elseSchema = jsonSchemaInfo.elseSchema;
+        if (this.elseSchema != null) {
+            keywordToValidator.put("else", new ElseValidator());
+        }
         this.keywordToValidator = keywordToValidator;
     }
 
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
index 6d59bf27219..e423d151a5e 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
@@ -187,4 +187,14 @@ public JsonSchemaInfo ifSchema(Class<? extends JsonSchema> ifSchema) {
         this.ifSchema = ifSchema;
         return this;
     }
+    public @Nullable Class<? extends JsonSchema> then = null;
+    public JsonSchemaInfo then(Class<? extends JsonSchema> then) {
+        this.then = then;
+        return this;
+    }
+    public @Nullable Class<? extends JsonSchema> elseSchema = null;
+    public JsonSchemaInfo elseSchema(Class<? extends JsonSchema> elseSchema) {
+        this.elseSchema = elseSchema;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
new file mode 100644
index 00000000000..5afd691e37c
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
@@ -0,0 +1,34 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+public class ThenValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        var then = data.schema().then;
+        if (then == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (ifPathToSchemas.isEmpty()) {
+            // if validation is false
+            return null;
+        }
+        JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        try {
+            var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+            pathToSchemas.update(ifPathToSchemas);
+            pathToSchemas.update(thenPathToSchemas);
+        } catch (ValidationException | InvalidTypeException ignored) {}
+        return pathToSchemas;
+    }
+}
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
index 4f6b21d2543..8a30f5b3159 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
@@ -571,6 +571,7 @@ public void processOpts() {
         keywordValidatorFiles.add("DependentSchemasValidator");
         keywordValidatorFiles.add("DoubleEnumValidator");
         keywordValidatorFiles.add("DoubleValueMethod");
+        keywordValidatorFiles.add("ElseValidator");
         keywordValidatorFiles.add("EnumValidator");
         keywordValidatorFiles.add("ExclusiveMaximumValidator");
         keywordValidatorFiles.add("ExclusiveMinimumValidator");
@@ -622,6 +623,7 @@ public void processOpts() {
         keywordValidatorFiles.add("StringEnumValidator");
         keywordValidatorFiles.add("StringSchemaValidator");
         keywordValidatorFiles.add("StringValueMethod");
+        keywordValidatorFiles.add("ThenValidator");
         keywordValidatorFiles.add("TypeValidator");
         keywordValidatorFiles.add("UniqueItemsValidator");
         keywordValidatorFiles.add("UnsetAnyTypeJsonSchema");
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
new file mode 100644
index 00000000000..281b2ecee90
--- /dev/null
+++ b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
@@ -0,0 +1,14 @@
+package {{{packageName}}}.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import {{{packageName}}}.exceptions.ValidationException;
+
+public class ElseValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        // todo
+        return null;
+    }
+}
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
index 8dee0c40f0b..d45b175eb61 100644
--- 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
@@ -55,6 +55,8 @@ public abstract class JsonSchema {
     public final @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties;
     public final @Nullable List<Class<? extends JsonSchema>> prefixItems;
     public final @Nullable Class<? extends JsonSchema> ifSchema;
+    public final @Nullable Class<? extends JsonSchema> then;
+    public final @Nullable Class<? extends JsonSchema> elseSchema;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -198,6 +200,14 @@ public abstract class JsonSchema {
         if (this.ifSchema != null) {
             keywordToValidator.put("if", new IfValidator());
         }
+        this.then = jsonSchemaInfo.then;
+        if (this.then != null) {
+            keywordToValidator.put("then", new ThenValidator());
+        }
+        this.elseSchema = jsonSchemaInfo.elseSchema;
+        if (this.elseSchema != null) {
+            keywordToValidator.put("else", new ElseValidator());
+        }
         this.keywordToValidator = keywordToValidator;
     }
 
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchemaInfo.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchemaInfo.hbs
index 4c5f6638e62..948ef3a57be 100644
--- a/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchemaInfo.hbs
+++ b/src/main/resources/java/src/main/java/packagename/schemas/validation/JsonSchemaInfo.hbs
@@ -187,4 +187,14 @@ public class JsonSchemaInfo {
         this.ifSchema = ifSchema;
         return this;
     }
+    public @Nullable Class<? extends JsonSchema> then = null;
+    public JsonSchemaInfo then(Class<? extends JsonSchema> then) {
+        this.then = then;
+        return this;
+    }
+    public @Nullable Class<? extends JsonSchema> elseSchema = null;
+    public JsonSchemaInfo elseSchema(Class<? extends JsonSchema> elseSchema) {
+        this.elseSchema = elseSchema;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs
new file mode 100644
index 00000000000..c1829a6e9e3
--- /dev/null
+++ b/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs
@@ -0,0 +1,34 @@
+package {{{packageName}}}.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import {{{packageName}}}.exceptions.InvalidTypeException;
+import {{{packageName}}}.exceptions.ValidationException;
+
+public class ThenValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        var then = data.schema().then;
+        if (then == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (ifPathToSchemas.isEmpty()) {
+            // if validation is false
+            return null;
+        }
+        JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        try {
+            var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+            pathToSchemas.update(ifPathToSchemas);
+            pathToSchemas.update(thenPathToSchemas);
+        } catch (ValidationException | InvalidTypeException ignored) {}
+        return pathToSchemas;
+    }
+}

From c243e7982179ba844702df1cfe871c5a51645ffe Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 20 Jan 2024 10:10:17 -0800
Subject: [PATCH 2/8] Adds else validator implementation

---
 .../schemas/validation/ElseValidator.java     | 23 +++++++++++++++++--
 .../schemas/validation/ElseValidator.hbs      | 22 ++++++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
index 08bdd0a1035..6fda7da3ac4 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -1,6 +1,7 @@
 package org.openapijsonschematools.client.schemas.validation;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
 import org.openapijsonschematools.client.exceptions.ValidationException;
 
 public class ElseValidator implements KeywordValidator {
@@ -8,7 +9,25 @@ public class ElseValidator implements KeywordValidator {
     public @Nullable PathToSchemasMap validate(
         ValidationData data
     ) {
-        // todo
-        return null;
+        var elseSchema = data.schema().elseSchema;
+        if (elseSchema == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (!ifPathToSchemas.isEmpty()) {
+            // if validation is true
+            return null;
+        }
+        JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        try {
+            var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
+            pathToSchemas.update(elsePathToSchemas);
+        } catch (ValidationException | InvalidTypeException ignored) {}
+        return pathToSchemas;
     }
 }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
index 281b2ecee90..e64861daa58 100644
--- a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
+++ b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
@@ -8,7 +8,25 @@ public class ElseValidator implements KeywordValidator {
     public @Nullable PathToSchemasMap validate(
         ValidationData data
     ) {
-        // todo
-        return null;
+        var elseSchema = data.schema().elseSchema;
+        if (elseSchema == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (!ifPathToSchemas.isEmpty()) {
+            // if validation is true
+            return null;
+        }
+        JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        try {
+            var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
+            pathToSchemas.update(elsePathToSchemas);
+        } catch (ValidationException | InvalidTypeException ignored) {}
+        return pathToSchemas;
     }
 }

From a09272a6a3bf475a4fb6c3b631296b6a5bc9ba7c Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 20 Jan 2024 10:17:37 -0800
Subject: [PATCH 3/8] Updates templates to implement then and else

---
 .../SchemaClass/_Schema_anytypeOrMultitype.hbs  | 12 ++++++------
 .../schemas/SchemaClass/_Schema_boolean.hbs     | 12 ++++++------
 .../schemas/SchemaClass/_Schema_list.hbs        | 12 ++++++------
 .../schemas/SchemaClass/_Schema_map.hbs         | 12 ++++++------
 .../schemas/SchemaClass/_Schema_null.hbs        | 12 ++++++------
 .../schemas/SchemaClass/_Schema_number.hbs      | 12 ++++++------
 .../schemas/SchemaClass/_Schema_string.hbs      | 12 ++++++------
 .../components/schemas/SchemaClass/_else.hbs    | 17 +++++++++++++++++
 .../components/schemas/SchemaClass/_then.hbs    | 17 +++++++++++++++++
 .../schemas/docschema_fields_field.hbs          |  6 ++++++
 10 files changed, 82 insertions(+), 42 deletions(-)
 create mode 100644 src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_else.hbs
 create mode 100644 src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_then.hbs

diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs
index e832aa82553..101428586c3 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs
@@ -126,6 +126,12 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements {
         {{#if if_}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_if }}
         {{/if}}
+        {{#if then}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_then }}
+        {{/if}}
+        {{#if else_}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_else }}
+        {{/if}}
         );
     }
 
@@ -138,12 +144,6 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements {
 {{#if hasDiscriminatorWithNonEmptyMapping}}
     {{!> components/schemas/schema_cls/_discriminator }}
 {{/if}}
-{{#if then}}
-    {{!> components/schemas/schema_cls/_then }}
-{{/if}}
-{{#if else_}}
-    {{!> components/schemas/schema_cls/_else }}
-{{/if}}
 {{#if unevaluatedProperties}}
     {{!> components/schemas/schema_cls/_unevaluated_properties }}
 {{/if}}
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_boolean.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_boolean.hbs
index 067ffb074e5..03634aa2403 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_boolean.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_boolean.hbs
@@ -44,6 +44,12 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements B
         {{#if if_}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_if }}
         {{/if}}
+        {{#if then}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_then }}
+        {{/if}}
+        {{#if else_}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_else }}
+        {{/if}}
         );
     }
 
@@ -53,12 +59,6 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements B
         }
         return instance;
     }
-{{#if then}}
-    {{!> components/schemas/schema_cls/_then }}
-{{/if}}
-{{#if else_}}
-    {{!> components/schemas/schema_cls/_else }}
-{{/if}}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_validate_implementor }}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_getNewInstanceObject_implementor }}
 }
\ No newline at end of file
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_list.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_list.hbs
index 7125f76bafd..16a9af200e7 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_list.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_list.hbs
@@ -59,6 +59,12 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements L
         {{#if if_}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_if }}
         {{/if}}
+        {{#if then}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_then }}
+        {{/if}}
+        {{#if else_}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_else }}
+        {{/if}}
         );
     }
 
@@ -68,12 +74,6 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements L
         }
         return instance;
     }
-    {{#if then}}
-    {{!> components/schemas/schema_cls/_then }}
-    {{/if}}
-    {{#if else_}}
-    {{!> components/schemas/schema_cls/_else }}
-    {{/if}}
     {{#if unevaluatedItems}}
     {{!> components/schemas/schema_cls/_unevaluated_items }}
     {{/if}}
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_map.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_map.hbs
index c4d7ec4419a..a4a0abd89f9 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_map.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_map.hbs
@@ -62,6 +62,12 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements M
         {{#if if_}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_if }}
         {{/if}}
+        {{#if then}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_then }}
+        {{/if}}
+        {{#if else_}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_else }}
+        {{/if}}
         );
     }
 
@@ -74,12 +80,6 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements M
     {{#if hasDiscriminatorWithNonEmptyMapping}}
     {{!> components/schemas/schema_cls/_discriminator }}
     {{/if}}
-    {{#if then}}
-    {{!> components/schemas/schema_cls/_then }}
-    {{/if}}
-    {{#if else_}}
-    {{!> components/schemas/schema_cls/_else }}
-    {{/if}}
     {{#if unevaluatedProperties}}
     {{!> components/schemas/schema_cls/_unevaluated_properties }}
     {{/if}}
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_null.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_null.hbs
index 60de29faba0..7532a160966 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_null.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_null.hbs
@@ -44,6 +44,12 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements N
         {{#if if_}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_if }}
         {{/if}}
+        {{#if then}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_then }}
+        {{/if}}
+        {{#if else_}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_else }}
+        {{/if}}
         );
     }
 
@@ -53,12 +59,6 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements N
         }
         return instance;
     }
-{{#if then}}
-    {{!> components/schemas/schema_cls/_then }}
-{{/if}}
-{{#if else_}}
-    {{!> components/schemas/schema_cls/_else }}
-{{/if}}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_validate_implementor }}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_getNewInstanceObject_implementor }}
 }
\ No newline at end of file
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_number.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_number.hbs
index 3d5f5bcbe0c..00ef9c6b5f3 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_number.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_number.hbs
@@ -62,6 +62,12 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements {
         {{#if if_}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_if }}
         {{/if}}
+        {{#if then}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_then }}
+        {{/if}}
+        {{#if else_}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_else }}
+        {{/if}}
         );
     }
 
@@ -71,12 +77,6 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements {
         }
         return instance;
     }
-{{#if then}}
-    {{!> components/schemas/schema_cls/_then }}
-{{/if}}
-{{#if else_}}
-    {{!> components/schemas/schema_cls/_else }}
-{{/if}}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_validate_implementor }}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_getNewInstanceObject_implementor }}
 }
\ No newline at end of file
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_string.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_string.hbs
index 56391283885..27198b26e7b 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_string.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_Schema_string.hbs
@@ -56,6 +56,12 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements S
         {{#if if_}}
             {{> src/main/java/packagename/components/schemas/SchemaClass/_if }}
         {{/if}}
+        {{#if then}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_then }}
+        {{/if}}
+        {{#if else_}}
+            {{> src/main/java/packagename/components/schemas/SchemaClass/_else }}
+        {{/if}}
         );
     }
 
@@ -65,12 +71,6 @@ public static class {{jsonPathPiece.pascalCase}} extends JsonSchema implements S
         }
         return instance;
     }
-{{#if then}}
-    {{!> components/schemas/schema_cls/_then }}
-{{/if}}
-{{#if else_}}
-    {{!> components/schemas/schema_cls/_else }}
-{{/if}}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_validate_implementor }}
     {{> src/main/java/packagename/components/schemas/SchemaClass/_getNewInstanceObject_implementor }}
 {{#if defaultValue}}
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_else.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_else.hbs
new file mode 100644
index 00000000000..1175b6ce258
--- /dev/null
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_else.hbs
@@ -0,0 +1,17 @@
+{{#if forDocs}}
+    {{#with else_}}
+        {{#if refInfo.refClass}}
+            {{#if refInfo.refModule}}
+elseSchema = [{{refInfo.refModule}}.{{refInfo.refClass}}.class]({{docRoot}}{{refInfo.ref.pathFromDocRoot}}.md#{{refInfo.ref.jsonPathPiece.kebabCase}})
+            {{~else}}
+elseSchema = [{{refInfo.refClass}}.class](#{{refInfo.ref.jsonPathPiece.kebabCase}})
+            {{~/if}}
+        {{else}}
+elseSchema = [{{jsonPathPiece.pascalCase}}.class](#{{jsonPathPiece.kebabCase}})
+        {{~/if}}
+    {{~/with}}
+{{else}}
+    {{#with else_}}
+.elseSchema({{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.pascalCase}}{{/if}}.class)
+    {{/with}}
+{{/if}}
\ No newline at end of file
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_then.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_then.hbs
new file mode 100644
index 00000000000..524f4c9e8b2
--- /dev/null
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/SchemaClass/_then.hbs
@@ -0,0 +1,17 @@
+{{#if forDocs}}
+    {{#with then}}
+        {{#if refInfo.refClass}}
+            {{#if refInfo.refModule}}
+then = [{{refInfo.refModule}}.{{refInfo.refClass}}.class]({{docRoot}}{{refInfo.ref.pathFromDocRoot}}.md#{{refInfo.ref.jsonPathPiece.kebabCase}})
+            {{~else}}
+then = [{{refInfo.refClass}}.class](#{{refInfo.ref.jsonPathPiece.kebabCase}})
+            {{~/if}}
+        {{else}}
+then = [{{jsonPathPiece.pascalCase}}.class](#{{jsonPathPiece.kebabCase}})
+        {{~/if}}
+    {{~/with}}
+{{else}}
+    {{#with then}}
+.then({{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.pascalCase}}{{/if}}.class)
+    {{/with}}
+{{/if}}
\ No newline at end of file
diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_fields_field.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_fields_field.hbs
index 9db6927dd1f..57bb818e183 100644
--- a/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_fields_field.hbs
+++ b/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_fields_field.hbs
@@ -100,3 +100,9 @@
 {{#if if_}}
 | Class<? extends JsonSchema> | {{> src/main/java/packagename/components/schemas/SchemaClass/_if }} |
 {{/if}}
+{{#if then}}
+| Class<? extends JsonSchema> | {{> src/main/java/packagename/components/schemas/SchemaClass/_then }} |
+{{/if}}
+{{#if else_}}
+| Class<? extends JsonSchema> | {{> src/main/java/packagename/components/schemas/SchemaClass/_else }} |
+{{/if}}

From 00b9cb093c1c80a7fb01c9003531d2ff0b7d1faf Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 20 Jan 2024 10:21:29 -0800
Subject: [PATCH 4/8] 310 Sample document updated to include new then + else
 samples

---
 .../3_1_0_unit_test_spec_nopaths.yaml         | 152 ++++++++++++++++++
 .../3_1/unit_test_spec/spec_writer.py         |   7 -
 2 files changed, 152 insertions(+), 7 deletions(-)

diff --git a/src/test/resources/3_1/unit_test_spec/3_1_0_unit_test_spec_nopaths.yaml b/src/test/resources/3_1/unit_test_spec/3_1_0_unit_test_spec_nopaths.yaml
index 1d9c8726387..162fa782a7b 100644
--- a/src/test/resources/3_1/unit_test_spec/3_1_0_unit_test_spec_nopaths.yaml
+++ b/src/test/resources/3_1/unit_test_spec/3_1_0_unit_test_spec_nopaths.yaml
@@ -313,6 +313,51 @@ components:
       $schema: https://json-schema.org/draft/2020-12/schema
       if:
         const: 0
+    IgnoreThenWithoutIf:
+      $schema: https://json-schema.org/draft/2020-12/schema
+      then:
+        const: 0
+    IgnoreElseWithoutIf:
+      $schema: https://json-schema.org/draft/2020-12/schema
+      else:
+        const: 0
+    IfAndThenWithoutElse:
+      $schema: https://json-schema.org/draft/2020-12/schema
+      if:
+        exclusiveMaximum: 0
+      then:
+        minimum: -10
+    IfAndElseWithoutThen:
+      $schema: https://json-schema.org/draft/2020-12/schema
+      if:
+        exclusiveMaximum: 0
+      else:
+        multipleOf: 2
+    ValidateAgainstCorrectBranchThenVsElse:
+      $schema: https://json-schema.org/draft/2020-12/schema
+      if:
+        exclusiveMaximum: 0
+      then:
+        minimum: -10
+      else:
+        multipleOf: 2
+    NonInterferenceAcrossCombinedSchemas:
+      $schema: https://json-schema.org/draft/2020-12/schema
+      allOf:
+      - if:
+          exclusiveMaximum: 0
+      - then:
+          minimum: -10
+      - else:
+          multipleOf: 2
+    IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence:
+      $schema: https://json-schema.org/draft/2020-12/schema
+      then:
+        const: 'yes'
+      else:
+        const: other
+      if:
+        maxLength: 4
     NestedItems:
       $schema: https://json-schema.org/draft/2020-12/schema
       type: array
@@ -2178,6 +2223,113 @@ components:
         data: hello
         valid: true
         comment: null
+    IgnoreThenWithoutIf:
+      ValidWhenValidAgainstLoneThen:
+        description: valid when valid against lone then
+        data: 0
+        valid: true
+        comment: null
+      ValidWhenInvalidAgainstLoneThen:
+        description: valid when invalid against lone then
+        data: hello
+        valid: true
+        comment: null
+    IgnoreElseWithoutIf:
+      ValidWhenValidAgainstLoneElse:
+        description: valid when valid against lone else
+        data: 0
+        valid: true
+        comment: null
+      ValidWhenInvalidAgainstLoneElse:
+        description: valid when invalid against lone else
+        data: hello
+        valid: true
+        comment: null
+    IfAndThenWithoutElse:
+      ValidThroughThen:
+        description: valid through then
+        data: -1
+        valid: true
+        comment: null
+      InvalidThroughThen:
+        description: invalid through then
+        data: -100
+        valid: false
+        comment: null
+      ValidWhenIfTestFails:
+        description: valid when if test fails
+        data: 3
+        valid: true
+        comment: null
+    IfAndElseWithoutThen:
+      ValidWhenIfTestPasses:
+        description: valid when if test passes
+        data: -1
+        valid: true
+        comment: null
+      ValidThroughElse:
+        description: valid through else
+        data: 4
+        valid: true
+        comment: null
+      InvalidThroughElse:
+        description: invalid through else
+        data: 3
+        valid: false
+        comment: null
+    ValidateAgainstCorrectBranchThenVsElse:
+      ValidThroughThen:
+        description: valid through then
+        data: -1
+        valid: true
+        comment: null
+      InvalidThroughThen:
+        description: invalid through then
+        data: -100
+        valid: false
+        comment: null
+      ValidThroughElse:
+        description: valid through else
+        data: 4
+        valid: true
+        comment: null
+      InvalidThroughElse:
+        description: invalid through else
+        data: 3
+        valid: false
+        comment: null
+    NonInterferenceAcrossCombinedSchemas:
+      ValidButWouldHaveBeenInvalidThroughThen:
+        description: valid, but would have been invalid through then
+        data: -100
+        valid: true
+        comment: null
+      ValidButWouldHaveBeenInvalidThroughElse:
+        description: valid, but would have been invalid through else
+        data: 3
+        valid: true
+        comment: null
+    IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence:
+      YesRedirectsToThenAndPasses:
+        description: yes redirects to then and passes
+        data: 'yes'
+        valid: true
+        comment: null
+      OtherRedirectsToElseAndPasses:
+        description: other redirects to else and passes
+        data: other
+        valid: true
+        comment: null
+      NoRedirectsToThenAndFails:
+        description: no redirects to then and fails
+        data: 'no'
+        valid: false
+        comment: null
+      InvalidRedirectsToElseAndFails:
+        description: invalid redirects to else and fails
+        data: invalid
+        valid: false
+        comment: null
     NestedItems:
       ValidNestedArray:
         description: valid nested array
diff --git a/src/test/resources/3_1/unit_test_spec/spec_writer.py b/src/test/resources/3_1/unit_test_spec/spec_writer.py
index 7faaef919d8..39d384192a6 100644
--- a/src/test/resources/3_1/unit_test_spec/spec_writer.py
+++ b/src/test/resources/3_1/unit_test_spec/spec_writer.py
@@ -701,13 +701,6 @@ def write_openapi_spec():
     openapi.tags = []
     removed_cases = {
         'UnevaluateditemsDependsOnMultipleNestedContains',
-        'IfAndThenWithoutElse',
-        'IfAndElseWithoutThen',
-        'ValidateAgainstCorrectBranchThenVsElse',
-        'NonInterferenceAcrossCombinedSchemas',
-        'IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence',
-        'IgnoreThenWithoutIf',
-        'IgnoreElseWithoutIf',
         'UnevaluateditemsAsSchema',
         'UnevaluateditemsWithNullInstanceElements',
         'UnevaluatedpropertiesNotAffectedByPropertynames',

From 85356147f7e943b437c1a6e8a537785263f57921 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 20 Jan 2024 10:23:29 -0800
Subject: [PATCH 5/8] 310 sample regen

---
 .../java/.openapi-generator/FILES             |   21 +
 samples/client/3_1_0_unit_test/java/README.md |    7 +
 .../schemas/IfAndElseWithoutThen.md           |   88 +
 .../schemas/IfAndThenWithoutElse.md           |   88 +
 ...WhenSerializedKeywordProcessingSequence.md |  137 ++
 .../components/schemas/IgnoreElseWithoutIf.md |   74 +
 .../components/schemas/IgnoreThenWithoutIf.md |   74 +
 .../NonInterferenceAcrossCombinedSchemas.md   |  187 +++
 .../ValidateAgainstCorrectBranchThenVsElse.md |  114 ++
 .../schemas/IfAndElseWithoutThen.java         |  630 ++++++++
 .../schemas/IfAndThenWithoutElse.java         |  629 ++++++++
 ...enSerializedKeywordProcessingSequence.java |  851 ++++++++++
 .../schemas/IgnoreElseWithoutIf.java          |  447 ++++++
 .../schemas/IgnoreThenWithoutIf.java          |  447 ++++++
 .../NonInterferenceAcrossCombinedSchemas.java | 1413 +++++++++++++++++
 ...alidateAgainstCorrectBranchThenVsElse.java |  826 ++++++++++
 .../schemas/validation/ElseValidator.java     |    1 -
 .../schemas/IfAndElseWithoutThenTest.java     |   54 +
 .../schemas/IfAndThenWithoutElseTest.java     |   54 +
 ...rializedKeywordProcessingSequenceTest.java |   69 +
 .../schemas/IgnoreElseWithoutIfTest.java      |   39 +
 .../schemas/IgnoreThenWithoutIfTest.java      |   39 +
 ...InterferenceAcrossCombinedSchemasTest.java |   39 +
 ...ateAgainstCorrectBranchThenVsElseTest.java |   69 +
 24 files changed, 6396 insertions(+), 1 deletion(-)
 create mode 100644 samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndElseWithoutThen.md
 create mode 100644 samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndThenWithoutElse.md
 create mode 100644 samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.md
 create mode 100644 samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreElseWithoutIf.md
 create mode 100644 samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreThenWithoutIf.md
 create mode 100644 samples/client/3_1_0_unit_test/java/docs/components/schemas/NonInterferenceAcrossCombinedSchemas.md
 create mode 100644 samples/client/3_1_0_unit_test/java/docs/components/schemas/ValidateAgainstCorrectBranchThenVsElse.md
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThen.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElse.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIf.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIf.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemas.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElse.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThenTest.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElseTest.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequenceTest.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIfTest.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIfTest.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemasTest.java
 create mode 100644 samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElseTest.java

diff --git a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
index a547e7b664b..d1fdfb8cc22 100644
--- a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
+++ b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
@@ -47,7 +47,12 @@ docs/components/schemas/ForbiddenProperty.md
 docs/components/schemas/HostnameFormat.md
 docs/components/schemas/IdnEmailFormat.md
 docs/components/schemas/IdnHostnameFormat.md
+docs/components/schemas/IfAndElseWithoutThen.md
+docs/components/schemas/IfAndThenWithoutElse.md
+docs/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.md
+docs/components/schemas/IgnoreElseWithoutIf.md
 docs/components/schemas/IgnoreIfWithoutThenOrElse.md
+docs/components/schemas/IgnoreThenWithoutIf.md
 docs/components/schemas/IntegerTypeMatchesIntegers.md
 docs/components/schemas/Ipv4Format.md
 docs/components/schemas/Ipv6Format.md
@@ -78,6 +83,7 @@ docs/components/schemas/NestedAnyofToCheckValidationSemantics.md
 docs/components/schemas/NestedItems.md
 docs/components/schemas/NestedOneofToCheckValidationSemantics.md
 docs/components/schemas/NonAsciiPatternWithAdditionalproperties.md
+docs/components/schemas/NonInterferenceAcrossCombinedSchemas.md
 docs/components/schemas/Not.md
 docs/components/schemas/NotMoreComplexSchema.md
 docs/components/schemas/NotMultipleTypes.md
@@ -130,6 +136,7 @@ docs/components/schemas/UriFormat.md
 docs/components/schemas/UriReferenceFormat.md
 docs/components/schemas/UriTemplateFormat.md
 docs/components/schemas/UuidFormat.md
+docs/components/schemas/ValidateAgainstCorrectBranchThenVsElse.md
 docs/servers/Server0.md
 pom.xml
 src/main/java/org/openapijsonschematools/client/components/schemas/ASchemaGivenForPrefixitems.java
@@ -180,7 +187,12 @@ src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProp
 src/main/java/org/openapijsonschematools/client/components/schemas/HostnameFormat.java
 src/main/java/org/openapijsonschematools/client/components/schemas/IdnEmailFormat.java
 src/main/java/org/openapijsonschematools/client/components/schemas/IdnHostnameFormat.java
+src/main/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThen.java
+src/main/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElse.java
+src/main/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.java
+src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIf.java
 src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreIfWithoutThenOrElse.java
+src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIf.java
 src/main/java/org/openapijsonschematools/client/components/schemas/IntegerTypeMatchesIntegers.java
 src/main/java/org/openapijsonschematools/client/components/schemas/Ipv4Format.java
 src/main/java/org/openapijsonschematools/client/components/schemas/Ipv6Format.java
@@ -211,6 +223,7 @@ src/main/java/org/openapijsonschematools/client/components/schemas/NestedAnyofTo
 src/main/java/org/openapijsonschematools/client/components/schemas/NestedItems.java
 src/main/java/org/openapijsonschematools/client/components/schemas/NestedOneofToCheckValidationSemantics.java
 src/main/java/org/openapijsonschematools/client/components/schemas/NonAsciiPatternWithAdditionalproperties.java
+src/main/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemas.java
 src/main/java/org/openapijsonschematools/client/components/schemas/Not.java
 src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java
 src/main/java/org/openapijsonschematools/client/components/schemas/NotMultipleTypes.java
@@ -263,6 +276,7 @@ src/main/java/org/openapijsonschematools/client/components/schemas/UriFormat.jav
 src/main/java/org/openapijsonschematools/client/components/schemas/UriReferenceFormat.java
 src/main/java/org/openapijsonschematools/client/components/schemas/UriTemplateFormat.java
 src/main/java/org/openapijsonschematools/client/components/schemas/UuidFormat.java
+src/main/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElse.java
 src/main/java/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlags.java
 src/main/java/org/openapijsonschematools/client/configurations/SchemaConfiguration.java
 src/main/java/org/openapijsonschematools/client/exceptions/BaseException.java
@@ -366,6 +380,13 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationMet
 src/main/java/org/openapijsonschematools/client/servers/Server0.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithVariables.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.java
+src/test/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThenTest.java
+src/test/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElseTest.java
+src/test/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequenceTest.java
+src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIfTest.java
+src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIfTest.java
+src/test/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemasTest.java
+src/test/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElseTest.java
 src/test/java/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlagsTest.java
 src/test/java/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.java
 src/test/java/org/openapijsonschematools/client/schemas/ArrayTypeSchemaTest.java
diff --git a/samples/client/3_1_0_unit_test/java/README.md b/samples/client/3_1_0_unit_test/java/README.md
index 40d9c54aeb2..e2ee48798be 100644
--- a/samples/client/3_1_0_unit_test/java/README.md
+++ b/samples/client/3_1_0_unit_test/java/README.md
@@ -205,7 +205,12 @@ allowed input and output types.
 | [HostnameFormat.HostnameFormat1](docs/components/schemas/HostnameFormat.md#hostnameformat1) | |
 | [IdnEmailFormat.IdnEmailFormat1](docs/components/schemas/IdnEmailFormat.md#idnemailformat1) | |
 | [IdnHostnameFormat.IdnHostnameFormat1](docs/components/schemas/IdnHostnameFormat.md#idnhostnameformat1) | |
+| [IfAndElseWithoutThen.IfAndElseWithoutThen1](docs/components/schemas/IfAndElseWithoutThen.md#ifandelsewithoutthen1) | |
+| [IfAndThenWithoutElse.IfAndThenWithoutElse1](docs/components/schemas/IfAndThenWithoutElse.md#ifandthenwithoutelse1) | |
+| [IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1](docs/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.md#ifappearsattheendwhenserializedkeywordprocessingsequence1) | |
+| [IgnoreElseWithoutIf.IgnoreElseWithoutIf1](docs/components/schemas/IgnoreElseWithoutIf.md#ignoreelsewithoutif1) | |
 | [IgnoreIfWithoutThenOrElse.IgnoreIfWithoutThenOrElse1](docs/components/schemas/IgnoreIfWithoutThenOrElse.md#ignoreifwithoutthenorelse1) | |
+| [IgnoreThenWithoutIf.IgnoreThenWithoutIf1](docs/components/schemas/IgnoreThenWithoutIf.md#ignorethenwithoutif1) | |
 | [IntegerTypeMatchesIntegers.IntegerTypeMatchesIntegers1](docs/components/schemas/IntegerTypeMatchesIntegers.md#integertypematchesintegers1) | |
 | [Ipv4Format.Ipv4Format1](docs/components/schemas/Ipv4Format.md#ipv4format1) | |
 | [Ipv6Format.Ipv6Format1](docs/components/schemas/Ipv6Format.md#ipv6format1) | |
@@ -236,6 +241,7 @@ allowed input and output types.
 | [NestedItems.NestedItems1](docs/components/schemas/NestedItems.md#nesteditems1) | |
 | [NestedOneofToCheckValidationSemantics.NestedOneofToCheckValidationSemantics1](docs/components/schemas/NestedOneofToCheckValidationSemantics.md#nestedoneoftocheckvalidationsemantics1) | |
 | [NonAsciiPatternWithAdditionalproperties.NonAsciiPatternWithAdditionalproperties1](docs/components/schemas/NonAsciiPatternWithAdditionalproperties.md#nonasciipatternwithadditionalproperties1) | |
+| [NonInterferenceAcrossCombinedSchemas.NonInterferenceAcrossCombinedSchemas1](docs/components/schemas/NonInterferenceAcrossCombinedSchemas.md#noninterferenceacrosscombinedschemas1) | |
 | [Not.Not1](docs/components/schemas/Not.md#not1) | |
 | [NotMoreComplexSchema.NotMoreComplexSchema1](docs/components/schemas/NotMoreComplexSchema.md#notmorecomplexschema1) | |
 | [NotMultipleTypes.NotMultipleTypes1](docs/components/schemas/NotMultipleTypes.md#notmultipletypes1) | |
@@ -288,3 +294,4 @@ allowed input and output types.
 | [UriReferenceFormat.UriReferenceFormat1](docs/components/schemas/UriReferenceFormat.md#urireferenceformat1) | |
 | [UriTemplateFormat.UriTemplateFormat1](docs/components/schemas/UriTemplateFormat.md#uritemplateformat1) | |
 | [UuidFormat.UuidFormat1](docs/components/schemas/UuidFormat.md#uuidformat1) | |
+| [ValidateAgainstCorrectBranchThenVsElse.ValidateAgainstCorrectBranchThenVsElse1](docs/components/schemas/ValidateAgainstCorrectBranchThenVsElse.md#validateagainstcorrectbranchthenvselse1) | |
diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndElseWithoutThen.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndElseWithoutThen.md
new file mode 100644
index 00000000000..90abef2b08a
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndElseWithoutThen.md
@@ -0,0 +1,88 @@
+# IfAndElseWithoutThen
+org.openapijsonschematools.client.components.schemas.IfAndElseWithoutThen.java
+public class IfAndElseWithoutThen
+
+A class that contains necessary nested
+- schema classes (which validate payloads), extends JsonSchema
+
+## Nested Class Summary
+| Modifier and Type | Class and Description |
+| ----------------- | ---------------------- |
+| static class | [IfAndElseWithoutThen.IfAndElseWithoutThen1](#ifandelsewithoutthen1)<br> schema class |
+| static class | [IfAndElseWithoutThen.IfSchema](#ifschema)<br> schema class |
+| static class | [IfAndElseWithoutThen.ElseSchema](#elseschema)<br> schema class |
+
+## IfAndElseWithoutThen1
+public static class IfAndElseWithoutThen1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | if = [IfSchema.class](#ifschema) |
+| Class<? extends JsonSchema> | elseSchema = [ElseSchema.class](#elseschema) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## IfSchema
+public static class IfSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Number | exclusiveMaximum = 0 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## ElseSchema
+public static class ElseSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| BigDecimal | multipleOf = new BigDecimal("2") |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+[[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndThenWithoutElse.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndThenWithoutElse.md
new file mode 100644
index 00000000000..3e03752d15c
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAndThenWithoutElse.md
@@ -0,0 +1,88 @@
+# IfAndThenWithoutElse
+org.openapijsonschematools.client.components.schemas.IfAndThenWithoutElse.java
+public class IfAndThenWithoutElse
+
+A class that contains necessary nested
+- schema classes (which validate payloads), extends JsonSchema
+
+## Nested Class Summary
+| Modifier and Type | Class and Description |
+| ----------------- | ---------------------- |
+| static class | [IfAndThenWithoutElse.IfAndThenWithoutElse1](#ifandthenwithoutelse1)<br> schema class |
+| static class | [IfAndThenWithoutElse.Then](#then)<br> schema class |
+| static class | [IfAndThenWithoutElse.IfSchema](#ifschema)<br> schema class |
+
+## IfAndThenWithoutElse1
+public static class IfAndThenWithoutElse1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | if = [IfSchema.class](#ifschema) |
+| Class<? extends JsonSchema> | then = [Then.class](#then) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Then
+public static class Then<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Number | minimum = -10 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## IfSchema
+public static class IfSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Number | exclusiveMaximum = 0 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+[[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.md
new file mode 100644
index 00000000000..d109d105b55
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.md
@@ -0,0 +1,137 @@
+# IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence
+org.openapijsonschematools.client.components.schemas.IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.java
+public class IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence
+
+A class that contains necessary nested
+- schema classes (which validate payloads), extends JsonSchema
+- enum classes
+
+## Nested Class Summary
+| Modifier and Type | Class and Description |
+| ----------------- | ---------------------- |
+| static class | [IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1](#ifappearsattheendwhenserializedkeywordprocessingsequence1)<br> schema class |
+| static class | [IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.Then](#then)<br> schema class |
+| enum | [IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.StringThenConst](#stringthenconst)<br>String enum |
+| static class | [IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.IfSchema](#ifschema)<br> schema class |
+| static class | [IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.ElseSchema](#elseschema)<br> schema class |
+| enum | [IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.StringElseConst](#stringelseconst)<br>String enum |
+
+## IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1
+public static class IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | if = [IfSchema.class](#ifschema) |
+| Class<? extends JsonSchema> | then = [Then.class](#then) |
+| Class<? extends JsonSchema> | elseSchema = [ElseSchema.class](#elseschema) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Then
+public static class Then<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## StringThenConst
+public enum StringThenConst<br>
+extends `Enum<StringThenConst>`
+
+A class that stores String enum values
+
+### Enum Constant Summary
+| Enum Constant | Description |
+| ------------- | ----------- |
+| YES | value = "yes" |
+
+## IfSchema
+public static class IfSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Integer | maxLength = 4 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## ElseSchema
+public static class ElseSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## StringElseConst
+public enum StringElseConst<br>
+extends `Enum<StringElseConst>`
+
+A class that stores String enum values
+
+### Enum Constant Summary
+| Enum Constant | Description |
+| ------------- | ----------- |
+| OTHER | value = "other" |
+
+[[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreElseWithoutIf.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreElseWithoutIf.md
new file mode 100644
index 00000000000..7dbd1fc5353
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreElseWithoutIf.md
@@ -0,0 +1,74 @@
+# IgnoreElseWithoutIf
+org.openapijsonschematools.client.components.schemas.IgnoreElseWithoutIf.java
+public class IgnoreElseWithoutIf
+
+A class that contains necessary nested
+- schema classes (which validate payloads), extends JsonSchema
+- enum classes
+
+## Nested Class Summary
+| Modifier and Type | Class and Description |
+| ----------------- | ---------------------- |
+| static class | [IgnoreElseWithoutIf.IgnoreElseWithoutIf1](#ignoreelsewithoutif1)<br> schema class |
+| static class | [IgnoreElseWithoutIf.ElseSchema](#elseschema)<br> schema class |
+| enum | [IgnoreElseWithoutIf.StringElseConst](#stringelseconst)<br>String enum |
+
+## IgnoreElseWithoutIf1
+public static class IgnoreElseWithoutIf1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | elseSchema = [ElseSchema.class](#elseschema) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## ElseSchema
+public static class ElseSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## StringElseConst
+public enum StringElseConst<br>
+extends `Enum<StringElseConst>`
+
+A class that stores String enum values
+
+### Enum Constant Summary
+| Enum Constant | Description |
+| ------------- | ----------- |
+| POSITIVE_0 | value = "0" |
+
+[[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreThenWithoutIf.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreThenWithoutIf.md
new file mode 100644
index 00000000000..d67c1d37ea1
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/IgnoreThenWithoutIf.md
@@ -0,0 +1,74 @@
+# IgnoreThenWithoutIf
+org.openapijsonschematools.client.components.schemas.IgnoreThenWithoutIf.java
+public class IgnoreThenWithoutIf
+
+A class that contains necessary nested
+- schema classes (which validate payloads), extends JsonSchema
+- enum classes
+
+## Nested Class Summary
+| Modifier and Type | Class and Description |
+| ----------------- | ---------------------- |
+| static class | [IgnoreThenWithoutIf.IgnoreThenWithoutIf1](#ignorethenwithoutif1)<br> schema class |
+| static class | [IgnoreThenWithoutIf.Then](#then)<br> schema class |
+| enum | [IgnoreThenWithoutIf.StringThenConst](#stringthenconst)<br>String enum |
+
+## IgnoreThenWithoutIf1
+public static class IgnoreThenWithoutIf1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | then = [Then.class](#then) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Then
+public static class Then<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## StringThenConst
+public enum StringThenConst<br>
+extends `Enum<StringThenConst>`
+
+A class that stores String enum values
+
+### Enum Constant Summary
+| Enum Constant | Description |
+| ------------- | ----------- |
+| POSITIVE_0 | value = "0" |
+
+[[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/NonInterferenceAcrossCombinedSchemas.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/NonInterferenceAcrossCombinedSchemas.md
new file mode 100644
index 00000000000..55a393fe855
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/NonInterferenceAcrossCombinedSchemas.md
@@ -0,0 +1,187 @@
+# NonInterferenceAcrossCombinedSchemas
+org.openapijsonschematools.client.components.schemas.NonInterferenceAcrossCombinedSchemas.java
+public class NonInterferenceAcrossCombinedSchemas
+
+A class that contains necessary nested
+- schema classes (which validate payloads), extends JsonSchema
+
+## Nested Class Summary
+| Modifier and Type | Class and Description |
+| ----------------- | ---------------------- |
+| static class | [NonInterferenceAcrossCombinedSchemas.NonInterferenceAcrossCombinedSchemas1](#noninterferenceacrosscombinedschemas1)<br> schema class |
+| static class | [NonInterferenceAcrossCombinedSchemas.Schema2](#schema2)<br> schema class |
+| static class | [NonInterferenceAcrossCombinedSchemas.ElseSchema](#elseschema)<br> schema class |
+| static class | [NonInterferenceAcrossCombinedSchemas.Schema1](#schema1)<br> schema class |
+| static class | [NonInterferenceAcrossCombinedSchemas.Then](#then)<br> schema class |
+| static class | [NonInterferenceAcrossCombinedSchemas.Schema0](#schema0)<br> schema class |
+| static class | [NonInterferenceAcrossCombinedSchemas.IfSchema](#ifschema)<br> schema class |
+
+## NonInterferenceAcrossCombinedSchemas1
+public static class NonInterferenceAcrossCombinedSchemas1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| List<Class<? extends JsonSchema>> | allOf = List.of(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0.class](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1.class](#schema1),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema2.class](#schema2)<br>;)<br> |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Schema2
+public static class Schema2<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | elseSchema = [ElseSchema.class](#elseschema) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## ElseSchema
+public static class ElseSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| BigDecimal | multipleOf = new BigDecimal("2") |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Schema1
+public static class Schema1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | then = [Then.class](#then) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Then
+public static class Then<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Number | minimum = -10 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Schema0
+public static class Schema0<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | if = [IfSchema.class](#ifschema) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## IfSchema
+public static class IfSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Number | exclusiveMaximum = 0 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+[[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/ValidateAgainstCorrectBranchThenVsElse.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/ValidateAgainstCorrectBranchThenVsElse.md
new file mode 100644
index 00000000000..d4ef583d6ab
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/ValidateAgainstCorrectBranchThenVsElse.md
@@ -0,0 +1,114 @@
+# ValidateAgainstCorrectBranchThenVsElse
+org.openapijsonschematools.client.components.schemas.ValidateAgainstCorrectBranchThenVsElse.java
+public class ValidateAgainstCorrectBranchThenVsElse
+
+A class that contains necessary nested
+- schema classes (which validate payloads), extends JsonSchema
+
+## Nested Class Summary
+| Modifier and Type | Class and Description |
+| ----------------- | ---------------------- |
+| static class | [ValidateAgainstCorrectBranchThenVsElse.ValidateAgainstCorrectBranchThenVsElse1](#validateagainstcorrectbranchthenvselse1)<br> schema class |
+| static class | [ValidateAgainstCorrectBranchThenVsElse.Then](#then)<br> schema class |
+| static class | [ValidateAgainstCorrectBranchThenVsElse.IfSchema](#ifschema)<br> schema class |
+| static class | [ValidateAgainstCorrectBranchThenVsElse.ElseSchema](#elseschema)<br> schema class |
+
+## ValidateAgainstCorrectBranchThenVsElse1
+public static class ValidateAgainstCorrectBranchThenVsElse1<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Class<? extends JsonSchema> | if = [IfSchema.class](#ifschema) |
+| Class<? extends JsonSchema> | then = [Then.class](#then) |
+| Class<? extends JsonSchema> | elseSchema = [ElseSchema.class](#elseschema) |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## Then
+public static class Then<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Number | minimum = -10 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## IfSchema
+public static class IfSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| Number | exclusiveMaximum = 0 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+## ElseSchema
+public static class ElseSchema<br>
+extends JsonSchema
+
+A schema class that validates payloads
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | ---------------------- |
+| BigDecimal | multipleOf = new BigDecimal("2") |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| String | validate(String arg, SchemaConfiguration configuration) |
+| Void | validate(Void arg, SchemaConfiguration configuration) |
+| int | validate(int arg, SchemaConfiguration configuration) |
+| long | validate(long arg, SchemaConfiguration configuration) |
+| float | validate(float arg, SchemaConfiguration configuration) |
+| double | validate(double arg, SchemaConfiguration configuration) |
+| boolean | validate(boolean arg, SchemaConfiguration configuration) |
+| FrozenMap<String, @Nullable Object> | validate(Map&lt;?, ?&gt; arg, SchemaConfiguration configuration) |
+| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
+| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
+[[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThen.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThen.java
new file mode 100644
index 00000000000..b0ebb071f89
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThen.java
@@ -0,0 +1,630 @@
+package org.openapijsonschematools.client.components.schemas;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+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.StringSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
+
+public class IfAndElseWithoutThen {
+    // nest classes so all schemas and input/output classes can be public
+    
+    
+    public static class ElseSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable ElseSchema instance = null;
+    
+        protected ElseSchema() {
+            super(new JsonSchemaInfo()
+                .multipleOf(new BigDecimal("2"))
+            );
+        }
+    
+        public static ElseSchema getInstance() {
+            if (instance == null) {
+                instance = new ElseSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IfSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable IfSchema instance = null;
+    
+        protected IfSchema() {
+            super(new JsonSchemaInfo()
+                .exclusiveMaximum(0)
+            );
+        }
+    
+        public static IfSchema getInstance() {
+            if (instance == null) {
+                instance = new IfSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IfAndElseWithoutThen1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        /*
+        NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
+        Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
+    
+        Do not edit the class manually.
+        */
+        private static @Nullable IfAndElseWithoutThen1 instance = null;
+    
+        protected IfAndElseWithoutThen1() {
+            super(new JsonSchemaInfo()
+                .ifSchema(IfSchema.class)
+                .elseSchema(ElseSchema.class)
+            );
+        }
+    
+        public static IfAndElseWithoutThen1 getInstance() {
+            if (instance == null) {
+                instance = new IfAndElseWithoutThen1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElse.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElse.java
new file mode 100644
index 00000000000..8eddf7a51d4
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElse.java
@@ -0,0 +1,629 @@
+package org.openapijsonschematools.client.components.schemas;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+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.StringSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
+
+public class IfAndThenWithoutElse {
+    // nest classes so all schemas and input/output classes can be public
+    
+    
+    public static class IfSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable IfSchema instance = null;
+    
+        protected IfSchema() {
+            super(new JsonSchemaInfo()
+                .exclusiveMaximum(0)
+            );
+        }
+    
+        public static IfSchema getInstance() {
+            if (instance == null) {
+                instance = new IfSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class Then extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Then instance = null;
+    
+        protected Then() {
+            super(new JsonSchemaInfo()
+                .minimum(-10)
+            );
+        }
+    
+        public static Then getInstance() {
+            if (instance == null) {
+                instance = new Then();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IfAndThenWithoutElse1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        /*
+        NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
+        Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
+    
+        Do not edit the class manually.
+        */
+        private static @Nullable IfAndThenWithoutElse1 instance = null;
+    
+        protected IfAndThenWithoutElse1() {
+            super(new JsonSchemaInfo()
+                .ifSchema(IfSchema.class)
+                .then(Then.class)
+            );
+        }
+    
+        public static IfAndThenWithoutElse1 getInstance() {
+            if (instance == null) {
+                instance = new IfAndThenWithoutElse1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.java
new file mode 100644
index 00000000000..2f2634ce30a
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.java
@@ -0,0 +1,851 @@
+package org.openapijsonschematools.client.components.schemas;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+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.StringEnumValidator;
+import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.StringValueMethod;
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
+
+public class IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence {
+    // nest classes so all schemas and input/output classes can be public
+    
+    public enum StringElseConst implements StringValueMethod {
+        OTHER("other");
+        private final String value;
+    
+        StringElseConst(String value) {
+            this.value = value;
+        }
+        public String value() {
+            return this.value;
+        }
+    }
+    
+    
+    public static class ElseSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable ElseSchema instance = null;
+    
+        protected ElseSchema() {
+            super(new JsonSchemaInfo()
+                .constValue("other")
+            );
+        }
+    
+        public static ElseSchema getInstance() {
+            if (instance == null) {
+                instance = new ElseSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IfSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable IfSchema instance = null;
+    
+        protected IfSchema() {
+            super(new JsonSchemaInfo()
+                .maxLength(4)
+            );
+        }
+    
+        public static IfSchema getInstance() {
+            if (instance == null) {
+                instance = new IfSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    public enum StringThenConst implements StringValueMethod {
+        YES("yes");
+        private final String value;
+    
+        StringThenConst(String value) {
+            this.value = value;
+        }
+        public String value() {
+            return this.value;
+        }
+    }
+    
+    
+    public static class Then extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Then instance = null;
+    
+        protected Then() {
+            super(new JsonSchemaInfo()
+                .constValue("yes")
+            );
+        }
+    
+        public static Then getInstance() {
+            if (instance == null) {
+                instance = new Then();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        /*
+        NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
+        Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
+    
+        Do not edit the class manually.
+        */
+        private static @Nullable IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1 instance = null;
+    
+        protected IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1() {
+            super(new JsonSchemaInfo()
+                .ifSchema(IfSchema.class)
+                .then(Then.class)
+                .elseSchema(ElseSchema.class)
+            );
+        }
+    
+        public static IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1 getInstance() {
+            if (instance == null) {
+                instance = new IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIf.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIf.java
new file mode 100644
index 00000000000..18e97f85f3f
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIf.java
@@ -0,0 +1,447 @@
+package org.openapijsonschematools.client.components.schemas;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+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.StringEnumValidator;
+import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.StringValueMethod;
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
+
+public class IgnoreElseWithoutIf {
+    // nest classes so all schemas and input/output classes can be public
+    
+    public enum StringElseConst implements StringValueMethod {
+        POSITIVE_0("0");
+        private final String value;
+    
+        StringElseConst(String value) {
+            this.value = value;
+        }
+        public String value() {
+            return this.value;
+        }
+    }
+    
+    
+    public static class ElseSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable ElseSchema instance = null;
+    
+        protected ElseSchema() {
+            super(new JsonSchemaInfo()
+                .constValue("0")
+            );
+        }
+    
+        public static ElseSchema getInstance() {
+            if (instance == null) {
+                instance = new ElseSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IgnoreElseWithoutIf1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        /*
+        NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
+        Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
+    
+        Do not edit the class manually.
+        */
+        private static @Nullable IgnoreElseWithoutIf1 instance = null;
+    
+        protected IgnoreElseWithoutIf1() {
+            super(new JsonSchemaInfo()
+                .elseSchema(ElseSchema.class)
+            );
+        }
+    
+        public static IgnoreElseWithoutIf1 getInstance() {
+            if (instance == null) {
+                instance = new IgnoreElseWithoutIf1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIf.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIf.java
new file mode 100644
index 00000000000..ac20771ebfd
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIf.java
@@ -0,0 +1,447 @@
+package org.openapijsonschematools.client.components.schemas;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+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.StringEnumValidator;
+import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.StringValueMethod;
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
+
+public class IgnoreThenWithoutIf {
+    // nest classes so all schemas and input/output classes can be public
+    
+    public enum StringThenConst implements StringValueMethod {
+        POSITIVE_0("0");
+        private final String value;
+    
+        StringThenConst(String value) {
+            this.value = value;
+        }
+        public String value() {
+            return this.value;
+        }
+    }
+    
+    
+    public static class Then extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Then instance = null;
+    
+        protected Then() {
+            super(new JsonSchemaInfo()
+                .constValue("0")
+            );
+        }
+    
+        public static Then getInstance() {
+            if (instance == null) {
+                instance = new Then();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IgnoreThenWithoutIf1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        /*
+        NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
+        Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
+    
+        Do not edit the class manually.
+        */
+        private static @Nullable IgnoreThenWithoutIf1 instance = null;
+    
+        protected IgnoreThenWithoutIf1() {
+            super(new JsonSchemaInfo()
+                .then(Then.class)
+            );
+        }
+    
+        public static IgnoreThenWithoutIf1 getInstance() {
+            if (instance == null) {
+                instance = new IgnoreThenWithoutIf1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemas.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemas.java
new file mode 100644
index 00000000000..a3b9dfc702e
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemas.java
@@ -0,0 +1,1413 @@
+package org.openapijsonschematools.client.components.schemas;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+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.StringSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
+
+public class NonInterferenceAcrossCombinedSchemas {
+    // nest classes so all schemas and input/output classes can be public
+    
+    
+    public static class IfSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable IfSchema instance = null;
+    
+        protected IfSchema() {
+            super(new JsonSchemaInfo()
+                .exclusiveMaximum(0)
+            );
+        }
+    
+        public static IfSchema getInstance() {
+            if (instance == null) {
+                instance = new IfSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class Schema0 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Schema0 instance = null;
+    
+        protected Schema0() {
+            super(new JsonSchemaInfo()
+                .ifSchema(IfSchema.class)
+            );
+        }
+    
+        public static Schema0 getInstance() {
+            if (instance == null) {
+                instance = new Schema0();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class Then extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Then instance = null;
+    
+        protected Then() {
+            super(new JsonSchemaInfo()
+                .minimum(-10)
+            );
+        }
+    
+        public static Then getInstance() {
+            if (instance == null) {
+                instance = new Then();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class Schema1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Schema1 instance = null;
+    
+        protected Schema1() {
+            super(new JsonSchemaInfo()
+                .then(Then.class)
+            );
+        }
+    
+        public static Schema1 getInstance() {
+            if (instance == null) {
+                instance = new Schema1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class ElseSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable ElseSchema instance = null;
+    
+        protected ElseSchema() {
+            super(new JsonSchemaInfo()
+                .multipleOf(new BigDecimal("2"))
+            );
+        }
+    
+        public static ElseSchema getInstance() {
+            if (instance == null) {
+                instance = new ElseSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class Schema2 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Schema2 instance = null;
+    
+        protected Schema2() {
+            super(new JsonSchemaInfo()
+                .elseSchema(ElseSchema.class)
+            );
+        }
+    
+        public static Schema2 getInstance() {
+            if (instance == null) {
+                instance = new Schema2();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class NonInterferenceAcrossCombinedSchemas1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        /*
+        NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
+        Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
+    
+        Do not edit the class manually.
+        */
+        private static @Nullable NonInterferenceAcrossCombinedSchemas1 instance = null;
+    
+        protected NonInterferenceAcrossCombinedSchemas1() {
+            super(new JsonSchemaInfo()
+                .allOf(List.of(
+                    Schema0.class,
+                    Schema1.class,
+                    Schema2.class
+                ))
+            );
+        }
+    
+        public static NonInterferenceAcrossCombinedSchemas1 getInstance() {
+            if (instance == null) {
+                instance = new NonInterferenceAcrossCombinedSchemas1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElse.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElse.java
new file mode 100644
index 00000000000..59ecb5961e5
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElse.java
@@ -0,0 +1,826 @@
+package org.openapijsonschematools.client.components.schemas;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+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.StringSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
+
+public class ValidateAgainstCorrectBranchThenVsElse {
+    // nest classes so all schemas and input/output classes can be public
+    
+    
+    public static class ElseSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable ElseSchema instance = null;
+    
+        protected ElseSchema() {
+            super(new JsonSchemaInfo()
+                .multipleOf(new BigDecimal("2"))
+            );
+        }
+    
+        public static ElseSchema getInstance() {
+            if (instance == null) {
+                instance = new ElseSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class IfSchema extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable IfSchema instance = null;
+    
+        protected IfSchema() {
+            super(new JsonSchemaInfo()
+                .exclusiveMaximum(0)
+            );
+        }
+    
+        public static IfSchema getInstance() {
+            if (instance == null) {
+                instance = new IfSchema();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class Then extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        private static @Nullable Then instance = null;
+    
+        protected Then() {
+            super(new JsonSchemaInfo()
+                .minimum(-10)
+            );
+        }
+    
+        public static Then getInstance() {
+            if (instance == null) {
+                instance = new Then();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }    
+    
+    public static class ValidateAgainstCorrectBranchThenVsElse1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {
+        /*
+        NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
+        Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
+    
+        Do not edit the class manually.
+        */
+        private static @Nullable ValidateAgainstCorrectBranchThenVsElse1 instance = null;
+    
+        protected ValidateAgainstCorrectBranchThenVsElse1() {
+            super(new JsonSchemaInfo()
+                .ifSchema(IfSchema.class)
+                .then(Then.class)
+                .elseSchema(ElseSchema.class)
+            );
+        }
+    
+        public static ValidateAgainstCorrectBranchThenVsElse1 getInstance() {
+            if (instance == null) {
+                instance = new ValidateAgainstCorrectBranchThenVsElse1();
+            }
+            return instance;
+        }
+        
+        @Override
+        public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Void castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            boolean castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        @Override
+        public Number validate(Number arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Number castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public int validate(int arg, SchemaConfiguration configuration) {
+            return (int) validate((Number) arg, configuration);
+        }
+        
+        public long validate(long arg, SchemaConfiguration configuration) {
+            return (long) validate((Number) arg, configuration);
+        }
+        
+        public float validate(float arg, SchemaConfiguration configuration) {
+            return (float) validate((Number) arg, configuration);
+        }
+        
+        public double validate(double arg, SchemaConfiguration configuration) {
+            return (double) validate((Number) arg, configuration);
+        }
+        
+        @Override
+        public String validate(String arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            String castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return castArg;
+        }
+        
+        public String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        public String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
+            return validate(arg.toString(), configuration);
+        }
+        
+        @Override
+        public FrozenList<@Nullable Object> getNewInstance(List<?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            List<@Nullable Object> items = new ArrayList<>();
+            int i = 0;
+            for (Object item: arg) {
+                List<Object> itemPathToItem = new ArrayList<>(pathToItem);
+                itemPathToItem.add(i);
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(itemPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema itemSchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object itemInstance = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas);
+                items.add(itemInstance);
+                i += 1;
+            }
+            FrozenList<@Nullable Object> newInstanceItems = new FrozenList<>(items);
+            return newInstanceItems;
+        }
+        
+        public FrozenList<@Nullable Object> validate(List<?> arg, SchemaConfiguration configuration) throws ValidationException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0");
+            List<?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public FrozenMap<@Nullable Object> getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
+            LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
+            for(Map.Entry<?, ?> entry: arg.entrySet()) {
+                @Nullable Object entryKey = entry.getKey();
+                if (!(entryKey instanceof String)) {
+                    throw new InvalidTypeException("Invalid non-string key value");
+                }
+                String propertyName = (String) entryKey;
+                List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
+                propertyPathToItem.add(propertyName);
+                Object value = entry.getValue();
+                LinkedHashMap<JsonSchema, Void> schemas = pathToSchemas.get(propertyPathToItem);
+                if (schemas == null) {
+                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                }
+                JsonSchema propertySchema = schemas.entrySet().iterator().next().getKey();
+                @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
+                properties.put(propertyName, propertyInstance);
+            }
+            FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
+            return castProperties;
+        }
+        
+        public FrozenMap<@Nullable Object> validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            Set<List<Object>> pathSet = new HashSet<>();
+            List<Object> pathToItem = List.of("args[0]");
+            Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
+            SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
+            PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap();
+            ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, validatedPathToSchemas, new LinkedHashSet<>());
+            PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
+            return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);
+        }
+        
+        @Override
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+            if (arg == null) {
+                return validate((Void) null, configuration);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return validate(boolArg, configuration);
+            } else if (arg instanceof Number) {
+                return validate((Number) arg, configuration);
+            } else if (arg instanceof String) {
+                return validate((String) arg, configuration);
+            } else if (arg instanceof List) {
+                return validate((List<?>) arg, configuration);
+            } else if (arg instanceof Map) {
+                return validate((Map<?, ?>) arg, configuration);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+        }        
+        @Override
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+            if (arg == null) {
+                return getNewInstance((Void) null, pathToItem, pathToSchemas);
+            } else if (arg instanceof Boolean) {
+                boolean boolArg = (Boolean) arg;
+                return getNewInstance(boolArg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Number) {
+                return getNewInstance((Number) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof String) {
+                return getNewInstance((String) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof List) {
+                return getNewInstance((List<?>) arg, pathToItem, pathToSchemas);
+            } else if (arg instanceof Map) {
+                return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
+            }
+            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
index 6fda7da3ac4..9968602ff94 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -1,7 +1,6 @@
 package org.openapijsonschematools.client.schemas.validation;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.openapijsonschematools.client.exceptions.InvalidTypeException;
 import org.openapijsonschematools.client.exceptions.ValidationException;
 
 public class ElseValidator implements KeywordValidator {
diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThenTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThenTest.java
new file mode 100644
index 00000000000..20a7dbdd4c7
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThenTest.java
@@ -0,0 +1,54 @@
+package org.openapijsonschematools.client.components.schemas;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.schemas.validation.MapUtils;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.AbstractMap;
+
+public class IfAndElseWithoutThenTest {
+    static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat());
+
+    @Test
+    public void testValidWhenIfTestPassesPasses() {
+        // valid when if test passes
+        final var schema = IfAndElseWithoutThen.IfAndElseWithoutThen1.getInstance();
+        schema.validate(
+            -1,
+            configuration
+        );
+    }
+
+    @Test
+    public void testValidThroughElsePasses() {
+        // valid through else
+        final var schema = IfAndElseWithoutThen.IfAndElseWithoutThen1.getInstance();
+        schema.validate(
+            4,
+            configuration
+        );
+    }
+
+    @Test
+    public void testInvalidThroughElseFails() {
+        // invalid through else
+        final var schema = IfAndElseWithoutThen.IfAndElseWithoutThen1.getInstance();
+        try {
+            schema.validate(
+                3,
+                configuration
+            );
+            throw new RuntimeException("A different exception must be thrown");
+        } catch (ValidationException | InvalidTypeException ignored) {
+            ;
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElseTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElseTest.java
new file mode 100644
index 00000000000..82af8c41e6f
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElseTest.java
@@ -0,0 +1,54 @@
+package org.openapijsonschematools.client.components.schemas;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.schemas.validation.MapUtils;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.AbstractMap;
+
+public class IfAndThenWithoutElseTest {
+    static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat());
+
+    @Test
+    public void testValidThroughThenPasses() {
+        // valid through then
+        final var schema = IfAndThenWithoutElse.IfAndThenWithoutElse1.getInstance();
+        schema.validate(
+            -1,
+            configuration
+        );
+    }
+
+    @Test
+    public void testInvalidThroughThenFails() {
+        // invalid through then
+        final var schema = IfAndThenWithoutElse.IfAndThenWithoutElse1.getInstance();
+        try {
+            schema.validate(
+                -100,
+                configuration
+            );
+            throw new RuntimeException("A different exception must be thrown");
+        } catch (ValidationException | InvalidTypeException ignored) {
+            ;
+        }
+    }
+
+    @Test
+    public void testValidWhenIfTestFailsPasses() {
+        // valid when if test fails
+        final var schema = IfAndThenWithoutElse.IfAndThenWithoutElse1.getInstance();
+        schema.validate(
+            3,
+            configuration
+        );
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequenceTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequenceTest.java
new file mode 100644
index 00000000000..56fd99e69bc
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequenceTest.java
@@ -0,0 +1,69 @@
+package org.openapijsonschematools.client.components.schemas;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.schemas.validation.MapUtils;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.AbstractMap;
+
+public class IfAppearsAtTheEndWhenSerializedKeywordProcessingSequenceTest {
+    static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat());
+
+    @Test
+    public void testInvalidRedirectsToElseAndFailsFails() {
+        // invalid redirects to else and fails
+        final var schema = IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1.getInstance();
+        try {
+            schema.validate(
+                "invalid",
+                configuration
+            );
+            throw new RuntimeException("A different exception must be thrown");
+        } catch (ValidationException | InvalidTypeException ignored) {
+            ;
+        }
+    }
+
+    @Test
+    public void testYesRedirectsToThenAndPassesPasses() {
+        // yes redirects to then and passes
+        final var schema = IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1.getInstance();
+        schema.validate(
+            "yes",
+            configuration
+        );
+    }
+
+    @Test
+    public void testOtherRedirectsToElseAndPassesPasses() {
+        // other redirects to else and passes
+        final var schema = IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1.getInstance();
+        schema.validate(
+            "other",
+            configuration
+        );
+    }
+
+    @Test
+    public void testNoRedirectsToThenAndFailsFails() {
+        // no redirects to then and fails
+        final var schema = IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence.IfAppearsAtTheEndWhenSerializedKeywordProcessingSequence1.getInstance();
+        try {
+            schema.validate(
+                "no",
+                configuration
+            );
+            throw new RuntimeException("A different exception must be thrown");
+        } catch (ValidationException | InvalidTypeException ignored) {
+            ;
+        }
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIfTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIfTest.java
new file mode 100644
index 00000000000..7f7c1fca73b
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIfTest.java
@@ -0,0 +1,39 @@
+package org.openapijsonschematools.client.components.schemas;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.schemas.validation.MapUtils;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.AbstractMap;
+
+public class IgnoreElseWithoutIfTest {
+    static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat());
+
+    @Test
+    public void testValidWhenInvalidAgainstLoneElsePasses() {
+        // valid when invalid against lone else
+        final var schema = IgnoreElseWithoutIf.IgnoreElseWithoutIf1.getInstance();
+        schema.validate(
+            "hello",
+            configuration
+        );
+    }
+
+    @Test
+    public void testValidWhenValidAgainstLoneElsePasses() {
+        // valid when valid against lone else
+        final var schema = IgnoreElseWithoutIf.IgnoreElseWithoutIf1.getInstance();
+        schema.validate(
+            0,
+            configuration
+        );
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIfTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIfTest.java
new file mode 100644
index 00000000000..71df12e95fb
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIfTest.java
@@ -0,0 +1,39 @@
+package org.openapijsonschematools.client.components.schemas;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.schemas.validation.MapUtils;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.AbstractMap;
+
+public class IgnoreThenWithoutIfTest {
+    static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat());
+
+    @Test
+    public void testValidWhenValidAgainstLoneThenPasses() {
+        // valid when valid against lone then
+        final var schema = IgnoreThenWithoutIf.IgnoreThenWithoutIf1.getInstance();
+        schema.validate(
+            0,
+            configuration
+        );
+    }
+
+    @Test
+    public void testValidWhenInvalidAgainstLoneThenPasses() {
+        // valid when invalid against lone then
+        final var schema = IgnoreThenWithoutIf.IgnoreThenWithoutIf1.getInstance();
+        schema.validate(
+            "hello",
+            configuration
+        );
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemasTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemasTest.java
new file mode 100644
index 00000000000..7e1b206bd0e
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemasTest.java
@@ -0,0 +1,39 @@
+package org.openapijsonschematools.client.components.schemas;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.schemas.validation.MapUtils;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.AbstractMap;
+
+public class NonInterferenceAcrossCombinedSchemasTest {
+    static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat());
+
+    @Test
+    public void testValidButWouldHaveBeenInvalidThroughElsePasses() {
+        // valid, but would have been invalid through else
+        final var schema = NonInterferenceAcrossCombinedSchemas.NonInterferenceAcrossCombinedSchemas1.getInstance();
+        schema.validate(
+            3,
+            configuration
+        );
+    }
+
+    @Test
+    public void testValidButWouldHaveBeenInvalidThroughThenPasses() {
+        // valid, but would have been invalid through then
+        final var schema = NonInterferenceAcrossCombinedSchemas.NonInterferenceAcrossCombinedSchemas1.getInstance();
+        schema.validate(
+            -100,
+            configuration
+        );
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElseTest.java b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElseTest.java
new file mode 100644
index 00000000000..b7d19ab6ebe
--- /dev/null
+++ b/samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElseTest.java
@@ -0,0 +1,69 @@
+package org.openapijsonschematools.client.components.schemas;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
+import org.openapijsonschematools.client.configurations.SchemaConfiguration;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.schemas.validation.MapUtils;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.AbstractMap;
+
+public class ValidateAgainstCorrectBranchThenVsElseTest {
+    static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat());
+
+    @Test
+    public void testValidThroughThenPasses() {
+        // valid through then
+        final var schema = ValidateAgainstCorrectBranchThenVsElse.ValidateAgainstCorrectBranchThenVsElse1.getInstance();
+        schema.validate(
+            -1,
+            configuration
+        );
+    }
+
+    @Test
+    public void testInvalidThroughThenFails() {
+        // invalid through then
+        final var schema = ValidateAgainstCorrectBranchThenVsElse.ValidateAgainstCorrectBranchThenVsElse1.getInstance();
+        try {
+            schema.validate(
+                -100,
+                configuration
+            );
+            throw new RuntimeException("A different exception must be thrown");
+        } catch (ValidationException | InvalidTypeException ignored) {
+            ;
+        }
+    }
+
+    @Test
+    public void testValidThroughElsePasses() {
+        // valid through else
+        final var schema = ValidateAgainstCorrectBranchThenVsElse.ValidateAgainstCorrectBranchThenVsElse1.getInstance();
+        schema.validate(
+            4,
+            configuration
+        );
+    }
+
+    @Test
+    public void testInvalidThroughElseFails() {
+        // invalid through else
+        final var schema = ValidateAgainstCorrectBranchThenVsElse.ValidateAgainstCorrectBranchThenVsElse1.getInstance();
+        try {
+            schema.validate(
+                3,
+                configuration
+            );
+            throw new RuntimeException("A different exception must be thrown");
+        } catch (ValidationException | InvalidTypeException ignored) {
+            ;
+        }
+    }
+}

From 71f2043d48c2cdcacf8f82b84d039a609dfc0ac2 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 20 Jan 2024 10:48:06 -0800
Subject: [PATCH 6/8] Fixes else validator functionality

---
 .../client/schemas/validation/ElseValidator.java          | 8 ++++----
 .../java/packagename/schemas/validation/ElseValidator.hbs | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
index 9968602ff94..32f753d075b 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -1,6 +1,7 @@
 package org.openapijsonschematools.client.schemas.validation;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
 import org.openapijsonschematools.client.exceptions.ValidationException;
 
 public class ElseValidator implements KeywordValidator {
@@ -23,10 +24,9 @@ public class ElseValidator implements KeywordValidator {
         }
         JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
-        try {
-            var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
-            pathToSchemas.update(elsePathToSchemas);
-        } catch (ValidationException | InvalidTypeException ignored) {}
+        var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
+        pathToSchemas.update(elsePathToSchemas);
+        // todo capture validation error and describe it as an else error?
         return pathToSchemas;
     }
 }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
index e64861daa58..8e6b05f38eb 100644
--- a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
+++ b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
@@ -1,6 +1,7 @@
 package {{{packageName}}}.schemas.validation;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import {{{packageName}}}.exceptions.InvalidTypeException;
 import {{{packageName}}}.exceptions.ValidationException;
 
 public class ElseValidator implements KeywordValidator {
@@ -23,10 +24,9 @@ public class ElseValidator implements KeywordValidator {
         }
         JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
-        try {
-            var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
-            pathToSchemas.update(elsePathToSchemas);
-        } catch (ValidationException | InvalidTypeException ignored) {}
+        var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
+        pathToSchemas.update(elsePathToSchemas);
+        // todo capture validation error and describe it as an else error?
         return pathToSchemas;
     }
 }

From c60c7787cd39935b04812ca5be475ca1d1d67976 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 20 Jan 2024 10:52:36 -0800
Subject: [PATCH 7/8] Fixes then functionality

---
 .../client/schemas/validation/ElseValidator.java         | 2 +-
 .../client/schemas/validation/ThenValidator.java         | 9 ++++-----
 .../packagename/schemas/validation/ElseValidator.hbs     | 2 +-
 .../packagename/schemas/validation/ThenValidator.hbs     | 9 ++++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
index 32f753d075b..b0ba9ecbc0a 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -25,8 +25,8 @@ public class ElseValidator implements KeywordValidator {
         JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
-        pathToSchemas.update(elsePathToSchemas);
         // todo capture validation error and describe it as an else error?
+        pathToSchemas.update(elsePathToSchemas);
         return pathToSchemas;
     }
 }
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
index 5afd691e37c..ad97e0e554e 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
@@ -24,11 +24,10 @@ public class ThenValidator implements KeywordValidator {
         }
         JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
-        try {
-            var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
-            pathToSchemas.update(ifPathToSchemas);
-            pathToSchemas.update(thenPathToSchemas);
-        } catch (ValidationException | InvalidTypeException ignored) {}
+        var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an then error?
+        pathToSchemas.update(ifPathToSchemas);
+        pathToSchemas.update(thenPathToSchemas);
         return pathToSchemas;
     }
 }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
index 8e6b05f38eb..9c5d8651e14 100644
--- a/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
+++ b/src/main/resources/java/src/main/java/packagename/schemas/validation/ElseValidator.hbs
@@ -25,8 +25,8 @@ public class ElseValidator implements KeywordValidator {
         JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
         var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
-        pathToSchemas.update(elsePathToSchemas);
         // todo capture validation error and describe it as an else error?
+        pathToSchemas.update(elsePathToSchemas);
         return pathToSchemas;
     }
 }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs b/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs
index c1829a6e9e3..e273bd5fed3 100644
--- a/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs
+++ b/src/main/resources/java/src/main/java/packagename/schemas/validation/ThenValidator.hbs
@@ -24,11 +24,10 @@ public class ThenValidator implements KeywordValidator {
         }
         JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
         PathToSchemasMap pathToSchemas = new PathToSchemasMap();
-        try {
-            var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
-            pathToSchemas.update(ifPathToSchemas);
-            pathToSchemas.update(thenPathToSchemas);
-        } catch (ValidationException | InvalidTypeException ignored) {}
+        var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an then error?
+        pathToSchemas.update(ifPathToSchemas);
+        pathToSchemas.update(thenPathToSchemas);
         return pathToSchemas;
     }
 }

From 5abbd7b908d2f347794ed76e8b90e853702fc2c8 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 20 Jan 2024 11:08:03 -0800
Subject: [PATCH 8/8] Samples and docs updated

---
 docs/generators/java.md                       |  4 +--
 .../java/.openapi-generator/FILES             |  2 ++
 .../schemas/validation/ElseValidator.java     | 32 ++++++++++++++++++
 .../client/schemas/validation/JsonSchema.java | 10 ++++++
 .../schemas/validation/JsonSchemaInfo.java    | 10 ++++++
 .../schemas/validation/ThenValidator.java     | 33 +++++++++++++++++++
 .../java/.openapi-generator/FILES             |  7 ----
 .../petstore/java/.openapi-generator/FILES    |  2 ++
 .../schemas/validation/ElseValidator.java     | 32 ++++++++++++++++++
 .../client/schemas/validation/JsonSchema.java | 10 ++++++
 .../schemas/validation/JsonSchemaInfo.java    | 10 ++++++
 .../schemas/validation/ThenValidator.java     | 33 +++++++++++++++++++
 .../generators/JavaClientGenerator.java       |  4 +--
 13 files changed, 178 insertions(+), 11 deletions(-)
 create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
 create mode 100644 samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
 create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
 create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java

diff --git a/docs/generators/java.md b/docs/generators/java.md
index 00930d5722d..4da0d1cbc90 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -282,7 +282,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |DependentRequired|✓|OAS3
 |DependentSchemas|✓|OAS3
 |Discriminator|✗|OAS2,OAS3
-|Else|✗|OAS3
+|Else|✓|OAS3
 |Enum|✓|OAS2,OAS3
 |ExclusiveMinimum|✓|OAS2,OAS3
 |ExclusiveMaximum|✓|OAS2,OAS3
@@ -310,7 +310,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |PropertyNames|✓|OAS3
 |Ref|✓|OAS2,OAS3
 |Required|✓|OAS2,OAS3
-|Then|✗|OAS3
+|Then|✓|OAS3
 |Type|✓|OAS2,OAS3
 |UnevaluatedItems|✗|OAS3
 |UnevaluatedProperties|✗|OAS3
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
index 97d6064455a..027bfd37c24 100644
--- a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES
+++ b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES
@@ -217,6 +217,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/DependentRequ
 src/main/java/org/openapijsonschematools/client/schemas/validation/DependentSchemasValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleValueMethod.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java
@@ -268,6 +269,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/RequiredValid
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringValueMethod.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.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/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
new file mode 100644
index 00000000000..b0ba9ecbc0a
--- /dev/null
+++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -0,0 +1,32 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+public class ElseValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        var elseSchema = data.schema().elseSchema;
+        if (elseSchema == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (!ifPathToSchemas.isEmpty()) {
+            // if validation is true
+            return null;
+        }
+        JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an else error?
+        pathToSchemas.update(elsePathToSchemas);
+        return pathToSchemas;
+    }
+}
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
index db33a080218..1925008547c 100644
--- 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
@@ -55,6 +55,8 @@ public abstract class JsonSchema {
     public final @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties;
     public final @Nullable List<Class<? extends JsonSchema>> prefixItems;
     public final @Nullable Class<? extends JsonSchema> ifSchema;
+    public final @Nullable Class<? extends JsonSchema> then;
+    public final @Nullable Class<? extends JsonSchema> elseSchema;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -198,6 +200,14 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
         if (this.ifSchema != null) {
             keywordToValidator.put("if", new IfValidator());
         }
+        this.then = jsonSchemaInfo.then;
+        if (this.then != null) {
+            keywordToValidator.put("then", new ThenValidator());
+        }
+        this.elseSchema = jsonSchemaInfo.elseSchema;
+        if (this.elseSchema != null) {
+            keywordToValidator.put("else", new ElseValidator());
+        }
         this.keywordToValidator = keywordToValidator;
     }
 
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
index 6d59bf27219..e423d151a5e 100644
--- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
+++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
@@ -187,4 +187,14 @@ public JsonSchemaInfo ifSchema(Class<? extends JsonSchema> ifSchema) {
         this.ifSchema = ifSchema;
         return this;
     }
+    public @Nullable Class<? extends JsonSchema> then = null;
+    public JsonSchemaInfo then(Class<? extends JsonSchema> then) {
+        this.then = then;
+        return this;
+    }
+    public @Nullable Class<? extends JsonSchema> elseSchema = null;
+    public JsonSchemaInfo elseSchema(Class<? extends JsonSchema> elseSchema) {
+        this.elseSchema = elseSchema;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
new file mode 100644
index 00000000000..ad97e0e554e
--- /dev/null
+++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
@@ -0,0 +1,33 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+public class ThenValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        var then = data.schema().then;
+        if (then == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (ifPathToSchemas.isEmpty()) {
+            // if validation is false
+            return null;
+        }
+        JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an then error?
+        pathToSchemas.update(ifPathToSchemas);
+        pathToSchemas.update(thenPathToSchemas);
+        return pathToSchemas;
+    }
+}
diff --git a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
index d1fdfb8cc22..89259247726 100644
--- a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
+++ b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES
@@ -380,13 +380,6 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationMet
 src/main/java/org/openapijsonschematools/client/servers/Server0.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithVariables.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.java
-src/test/java/org/openapijsonschematools/client/components/schemas/IfAndElseWithoutThenTest.java
-src/test/java/org/openapijsonschematools/client/components/schemas/IfAndThenWithoutElseTest.java
-src/test/java/org/openapijsonschematools/client/components/schemas/IfAppearsAtTheEndWhenSerializedKeywordProcessingSequenceTest.java
-src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreElseWithoutIfTest.java
-src/test/java/org/openapijsonschematools/client/components/schemas/IgnoreThenWithoutIfTest.java
-src/test/java/org/openapijsonschematools/client/components/schemas/NonInterferenceAcrossCombinedSchemasTest.java
-src/test/java/org/openapijsonschematools/client/components/schemas/ValidateAgainstCorrectBranchThenVsElseTest.java
 src/test/java/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlagsTest.java
 src/test/java/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.java
 src/test/java/org/openapijsonschematools/client/schemas/ArrayTypeSchemaTest.java
diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES
index 17d35aacbd5..eb646ed7b37 100644
--- a/samples/client/petstore/java/.openapi-generator/FILES
+++ b/samples/client/petstore/java/.openapi-generator/FILES
@@ -695,6 +695,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/DependentRequ
 src/main/java/org/openapijsonschematools/client/schemas/validation/DependentSchemasValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleValueMethod.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java
@@ -746,6 +747,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/RequiredValid
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/StringValueMethod.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.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/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
new file mode 100644
index 00000000000..b0ba9ecbc0a
--- /dev/null
+++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ElseValidator.java
@@ -0,0 +1,32 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+public class ElseValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        var elseSchema = data.schema().elseSchema;
+        if (elseSchema == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (!ifPathToSchemas.isEmpty()) {
+            // if validation is true
+            return null;
+        }
+        JsonSchema elseSchemaInstance = JsonSchemaFactory.getInstance(elseSchema);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        var elsePathToSchemas = JsonSchema.validate(elseSchemaInstance, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an else error?
+        pathToSchemas.update(elsePathToSchemas);
+        return pathToSchemas;
+    }
+}
diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
index db33a080218..1925008547c 100644
--- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
+++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java
@@ -55,6 +55,8 @@ public abstract class JsonSchema {
     public final @Nullable Map<Pattern, Class<? extends JsonSchema>> patternProperties;
     public final @Nullable List<Class<? extends JsonSchema>> prefixItems;
     public final @Nullable Class<? extends JsonSchema> ifSchema;
+    public final @Nullable Class<? extends JsonSchema> then;
+    public final @Nullable Class<? extends JsonSchema> elseSchema;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -198,6 +200,14 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
         if (this.ifSchema != null) {
             keywordToValidator.put("if", new IfValidator());
         }
+        this.then = jsonSchemaInfo.then;
+        if (this.then != null) {
+            keywordToValidator.put("then", new ThenValidator());
+        }
+        this.elseSchema = jsonSchemaInfo.elseSchema;
+        if (this.elseSchema != null) {
+            keywordToValidator.put("else", new ElseValidator());
+        }
         this.keywordToValidator = keywordToValidator;
     }
 
diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
index 6d59bf27219..e423d151a5e 100644
--- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
+++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.java
@@ -187,4 +187,14 @@ public JsonSchemaInfo ifSchema(Class<? extends JsonSchema> ifSchema) {
         this.ifSchema = ifSchema;
         return this;
     }
+    public @Nullable Class<? extends JsonSchema> then = null;
+    public JsonSchemaInfo then(Class<? extends JsonSchema> then) {
+        this.then = then;
+        return this;
+    }
+    public @Nullable Class<? extends JsonSchema> elseSchema = null;
+    public JsonSchemaInfo elseSchema(Class<? extends JsonSchema> elseSchema) {
+        this.elseSchema = elseSchema;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
new file mode 100644
index 00000000000..ad97e0e554e
--- /dev/null
+++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ThenValidator.java
@@ -0,0 +1,33 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.openapijsonschematools.client.exceptions.InvalidTypeException;
+import org.openapijsonschematools.client.exceptions.ValidationException;
+
+public class ThenValidator implements KeywordValidator {
+    @Override
+    public @Nullable PathToSchemasMap validate(
+        ValidationData data
+    ) {
+        var then = data.schema().then;
+        if (then == null) {
+            return null;
+        }
+        var ifPathToSchemas = data.ifPathToSchemas();
+        if (ifPathToSchemas == null) {
+            // if unset
+            return null;
+        }
+        if (ifPathToSchemas.isEmpty()) {
+            // if validation is false
+            return null;
+        }
+        JsonSchema thenSchema = JsonSchemaFactory.getInstance(then);
+        PathToSchemasMap pathToSchemas = new PathToSchemasMap();
+        var thenPathToSchemas = JsonSchema.validate(thenSchema, data.arg(), data.validationMetadata());
+        // todo capture validation error and describe it as an then error?
+        pathToSchemas.update(ifPathToSchemas);
+        pathToSchemas.update(thenPathToSchemas);
+        return pathToSchemas;
+    }
+}
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
index 8a30f5b3159..41bc0d864d1 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
@@ -261,7 +261,7 @@ public JavaClientGenerator() {
                         SchemaFeature.DependentRequired,
                         SchemaFeature.DependentSchemas,
                         // SchemaFeature.Discriminator,
-                        // SchemaFeature.Else,
+                        SchemaFeature.Else,
                         SchemaFeature.Enum,
                         SchemaFeature.ExclusiveMaximum,
                         SchemaFeature.ExclusiveMinimum,
@@ -289,7 +289,7 @@ public JavaClientGenerator() {
                         SchemaFeature.PropertyNames,
                         SchemaFeature.Ref,
                         SchemaFeature.Required,
-                        // SchemaFeature.Then,
+                        SchemaFeature.Then,
                         SchemaFeature.Type,
                         // SchemaFeature.UnevaluatedItems,
                         // SchemaFeature.UnevaluatedProperties,