Java, adds JsonSchema input map and list generics

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

@@ -226,6 +226,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/MinLengthVali
 src/main/java/org/openapijsonschematools/client/schemas/validation/MinPropertiesValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MinimumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/MultipleOfValidator.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/NonCollectionJsonSchema.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/PathToSchemasMap.java

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java

@@ -65,7 +65,7 @@ public class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapInput {
     }
 
 
-    public static class AdditionalpropertiesAllowsASchemaWhichShouldValidate1 extends JsonSchema<AdditionalpropertiesAllowsASchemaWhichShouldValidateMap, FrozenList> {
+    public static class AdditionalpropertiesAllowsASchemaWhichShouldValidate1 extends JsonSchema<Object, Object, AdditionalpropertiesAllowsASchemaWhichShouldValidateMap, Object, Object, FrozenList<Object>> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
@@ -84,8 +84,8 @@ public AdditionalpropertiesAllowsASchemaWhichShouldValidate1() {
         }
 
         @Override
-        protected AdditionalpropertiesAllowsASchemaWhichShouldValidateMap getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new AdditionalpropertiesAllowsASchemaWhichShouldValidateMap((FrozenMap<String, Object>) arg);
+        protected AdditionalpropertiesAllowsASchemaWhichShouldValidateMap getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new AdditionalpropertiesAllowsASchemaWhichShouldValidateMap(arg);
         }
         public AdditionalpropertiesAllowsASchemaWhichShouldValidateMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
             return validateMap(arg, configuration);

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java

@@ -64,7 +64,7 @@ public class AdditionalpropertiesAreAllowedByDefaultMapInput {
     }
 
 
-    public static class AdditionalpropertiesAreAllowedByDefault1 extends JsonSchema<AdditionalpropertiesAreAllowedByDefaultMap, FrozenList> {
+    public static class AdditionalpropertiesAreAllowedByDefault1 extends JsonSchema<Object, Object, AdditionalpropertiesAreAllowedByDefaultMap, Object, Object, FrozenList> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
@@ -81,8 +81,8 @@ public AdditionalpropertiesAreAllowedByDefault1() {
         }
 
         @Override
-        protected AdditionalpropertiesAreAllowedByDefaultMap getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new AdditionalpropertiesAreAllowedByDefaultMap((FrozenMap<String, Object>) arg);
+        protected AdditionalpropertiesAreAllowedByDefaultMap getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new AdditionalpropertiesAreAllowedByDefaultMap(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java

@@ -41,7 +41,7 @@ public class AdditionalpropertiesCanExistByItselfMapInput {
     }
 
 
-    public static class AdditionalpropertiesCanExistByItself1 extends JsonSchema<AdditionalpropertiesCanExistByItselfMap, FrozenList> {
+    public static class AdditionalpropertiesCanExistByItself1 extends JsonSchema<Boolean, Boolean, AdditionalpropertiesCanExistByItselfMap, Object, Object, FrozenList<Object>> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
@@ -56,8 +56,8 @@ public AdditionalpropertiesCanExistByItself1() {
         }
 
         @Override
-        protected AdditionalpropertiesCanExistByItselfMap getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new AdditionalpropertiesCanExistByItselfMap((FrozenMap<String, Boolean>) arg);
+        protected AdditionalpropertiesCanExistByItselfMap getMapOutputInstance(FrozenMap<String, Boolean> arg) {
+            return new AdditionalpropertiesCanExistByItselfMap(arg);
         }
         public AdditionalpropertiesCanExistByItselfMap validate(Map<String, Boolean> arg, SchemaConfiguration configuration) throws ValidationException {
             return validateMap(arg, configuration);

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java

@@ -60,7 +60,7 @@ public class Schema0MapInput {
     }
 
 
-    public static class Schema0 extends JsonSchema<Schema0Map, FrozenList> {
+    public static class Schema0 extends JsonSchema<Object, Object, Schema0Map, Object, Object, FrozenList> {
         public Schema0() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("properties", new PropertiesValidator(Map.ofEntries(
@@ -70,8 +70,8 @@ public Schema0() {
         }
 
         @Override
-        protected Schema0Map getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new Schema0Map((FrozenMap<String, Object>) arg);
+        protected Schema0Map getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new Schema0Map(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);
@@ -142,7 +142,7 @@ public class AdditionalpropertiesShouldNotLookInApplicatorsMapInput {
     }
 
 
-    public static class AdditionalpropertiesShouldNotLookInApplicators1 extends JsonSchema<AdditionalpropertiesShouldNotLookInApplicatorsMap, FrozenList> {
+    public static class AdditionalpropertiesShouldNotLookInApplicators1 extends JsonSchema<Boolean, Boolean, AdditionalpropertiesShouldNotLookInApplicatorsMap, Object, Object, FrozenList> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
@@ -159,8 +159,8 @@ public AdditionalpropertiesShouldNotLookInApplicators1() {
         }
 
         @Override
-        protected AdditionalpropertiesShouldNotLookInApplicatorsMap getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new AdditionalpropertiesShouldNotLookInApplicatorsMap((FrozenMap<String, Boolean>) arg);
+        protected AdditionalpropertiesShouldNotLookInApplicatorsMap getMapOutputInstance(FrozenMap<String, Boolean> arg) {
+            return new AdditionalpropertiesShouldNotLookInApplicatorsMap(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java

@@ -17,6 +17,7 @@
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
 import org.openapijsonschematools.client.schemas.validation.KeywordEntry;
 import org.openapijsonschematools.client.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.client.schemas.validation.NonCollectionJsonSchema;
 import org.openapijsonschematools.client.schemas.validation.PropertiesValidator;
 import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
 import org.openapijsonschematools.client.schemas.validation.RequiredValidator;
@@ -55,7 +56,7 @@ public class Schema0MapInput {
     }
 
 
-    public static class Schema0 extends JsonSchema<Schema0Map, FrozenList> {
+    public static class Schema0 extends JsonSchema<Object, Object, Schema0Map, Object, Object, FrozenList> {
         public Schema0() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("properties", new PropertiesValidator(Map.ofEntries(
@@ -68,8 +69,8 @@ public Schema0() {
         }
 
         @Override
-        protected Schema0Map getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new Schema0Map((FrozenMap<String, Object>) arg);
+        protected Schema0Map getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new Schema0Map(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);
@@ -150,7 +151,7 @@ public class Schema1MapInput {
     }
 
 
-    public static class Schema1 extends JsonSchema<Schema1Map, FrozenList> {
+    public static class Schema1 extends JsonSchema<Object, Object, Schema1Map, Object, Object, FrozenList> {
         public Schema1() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("properties", new PropertiesValidator(Map.ofEntries(
@@ -163,8 +164,8 @@ public Schema1() {
         }
 
         @Override
-        protected Schema1Map getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new Schema1Map((FrozenMap<String, Object>) arg);
+        protected Schema1Map getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new Schema1Map(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);
@@ -215,7 +216,7 @@ public FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configu
         }
     }    
 
-    public static class Allof1 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class Allof1 extends NonCollectionJsonSchema {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofCombinedWithAnyofOneof.java

@@ -11,18 +11,18 @@
 import org.openapijsonschematools.client.schemas.validation.AnyOfValidator;
 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.JsonSchemaFactory;
 import org.openapijsonschematools.client.schemas.validation.KeywordEntry;
 import org.openapijsonschematools.client.schemas.validation.KeywordValidator;
 import org.openapijsonschematools.client.schemas.validation.MultipleOfValidator;
+import org.openapijsonschematools.client.schemas.validation.NonCollectionJsonSchema;
 import org.openapijsonschematools.client.schemas.validation.OneOfValidator;
 
 public class AllofCombinedWithAnyofOneof {
     // nest classes so all schemas and input/output classes can be public
 
 
-    public static class Schema02 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class Schema02 extends NonCollectionJsonSchema {
         public Schema02() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("multipleOf", new MultipleOfValidator(2))
@@ -77,7 +77,7 @@ public FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configu
         }
     }    
 
-    public static class Schema01 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class Schema01 extends NonCollectionJsonSchema {
         public Schema01() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("multipleOf", new MultipleOfValidator(3))
@@ -132,7 +132,7 @@ public FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configu
         }
     }    
 
-    public static class Schema0 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class Schema0 extends NonCollectionJsonSchema {
         public Schema0() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("multipleOf", new MultipleOfValidator(5))
@@ -187,7 +187,7 @@ public FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configu
         }
     }    
 
-    public static class AllofCombinedWithAnyofOneof1 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class AllofCombinedWithAnyofOneof1 extends NonCollectionJsonSchema {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofSimpleTypes.java

@@ -10,18 +10,18 @@
 import org.openapijsonschematools.client.schemas.validation.AllOfValidator;
 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.JsonSchemaFactory;
 import org.openapijsonschematools.client.schemas.validation.KeywordEntry;
 import org.openapijsonschematools.client.schemas.validation.KeywordValidator;
 import org.openapijsonschematools.client.schemas.validation.MaximumValidator;
 import org.openapijsonschematools.client.schemas.validation.MinimumValidator;
+import org.openapijsonschematools.client.schemas.validation.NonCollectionJsonSchema;
 
 public class AllofSimpleTypes {
     // nest classes so all schemas and input/output classes can be public
 
 
-    public static class Schema0 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class Schema0 extends NonCollectionJsonSchema {
         public Schema0() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("maximum", new MaximumValidator(30))
@@ -76,7 +76,7 @@ public FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configu
         }
     }    
 
-    public static class Schema1 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class Schema1 extends NonCollectionJsonSchema {
         public Schema1() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("minimum", new MinimumValidator(20))
@@ -131,7 +131,7 @@ public FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configu
         }
     }    
 
-    public static class AllofSimpleTypes1 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class AllofSimpleTypes1 extends NonCollectionJsonSchema {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java

@@ -56,7 +56,7 @@ public class Schema0MapInput {
     }
 
 
-    public static class Schema0 extends JsonSchema<Schema0Map, FrozenList> {
+    public static class Schema0 extends JsonSchema<Object, Object, Schema0Map, Object, Object, FrozenList> {
         public Schema0() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("properties", new PropertiesValidator(Map.ofEntries(
@@ -69,8 +69,8 @@ public Schema0() {
         }
 
         @Override
-        protected Schema0Map getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new Schema0Map((FrozenMap<String, Object>) arg);
+        protected Schema0Map getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new Schema0Map(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);
@@ -151,7 +151,7 @@ public class Schema1MapInput {
     }
 
 
-    public static class Schema1 extends JsonSchema<Schema1Map, FrozenList> {
+    public static class Schema1 extends JsonSchema<Object, Object, Schema1Map, Object, Object, FrozenList> {
         public Schema1() {
             super(new LinkedHashMap<>(Map.ofEntries(
                 new KeywordEntry("properties", new PropertiesValidator(Map.ofEntries(
@@ -164,8 +164,8 @@ public Schema1() {
         }
 
         @Override
-        protected Schema1Map getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new Schema1Map((FrozenMap<String, Object>) arg);
+        protected Schema1Map getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new Schema1Map(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);
@@ -246,7 +246,7 @@ public class AllofWithBaseSchemaMapInput {
     }
 
 
-    public static class AllofWithBaseSchema1 extends JsonSchema<AllofWithBaseSchemaMap, FrozenList> {
+    public static class AllofWithBaseSchema1 extends JsonSchema<Object, Object, AllofWithBaseSchemaMap, Object, Object, FrozenList> {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
@@ -269,8 +269,8 @@ public AllofWithBaseSchema1() {
         }
 
         @Override
-        protected AllofWithBaseSchemaMap getMapOutputInstance(FrozenMap<?, ?> arg) {
-            return new AllofWithBaseSchemaMap((FrozenMap<String, Object>) arg);
+        protected AllofWithBaseSchemaMap getMapOutputInstance(FrozenMap<String, Object> arg) {
+            return new AllofWithBaseSchemaMap(arg);
         }
         public Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
             return validateVoid(arg, configuration);

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithOneEmptySchema.java

@@ -11,10 +11,10 @@
 import org.openapijsonschematools.client.schemas.validation.AllOfValidator;
 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.JsonSchemaFactory;
 import org.openapijsonschematools.client.schemas.validation.KeywordEntry;
 import org.openapijsonschematools.client.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.client.schemas.validation.NonCollectionJsonSchema;
 
 public class AllofWithOneEmptySchema {
     // nest classes so all schemas and input/output classes can be public
@@ -23,7 +23,7 @@ public class AllofWithOneEmptySchema {
     public static class Schema0 extends AnyTypeJsonSchema {}
 
 
-    public static class AllofWithOneEmptySchema1 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class AllofWithOneEmptySchema1 extends NonCollectionJsonSchema {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithTheFirstEmptySchema.java

@@ -12,10 +12,10 @@
 import org.openapijsonschematools.client.schemas.validation.AllOfValidator;
 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.JsonSchemaFactory;
 import org.openapijsonschematools.client.schemas.validation.KeywordEntry;
 import org.openapijsonschematools.client.schemas.validation.KeywordValidator;
+import org.openapijsonschematools.client.schemas.validation.NonCollectionJsonSchema;
 
 public class AllofWithTheFirstEmptySchema {
     // nest classes so all schemas and input/output classes can be public
@@ -27,7 +27,7 @@ public static class Schema0 extends AnyTypeJsonSchema {}
     public static class Schema1 extends NumberJsonSchema {}
 
 
-    public static class AllofWithTheFirstEmptySchema1 extends JsonSchema<FrozenMap, FrozenList> {
+    public static class AllofWithTheFirstEmptySchema1 extends NonCollectionJsonSchema {
         /*
         NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
         Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator