Java, improves ref schemas

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

@@ -341,14 +341,31 @@ src/main/java/org/openapijsonschematools/paths/userusername/get/responses/respon
 src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationxml/Schema.java
 src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java
 src/main/java/org/openapijsonschematools/paths/userusername/put/requestbody/content/applicationjson/Schema.java
+src/main/java/org/openapijsonschematools/schemas/AnyTypeJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java
 src/main/java/org/openapijsonschematools/schemas/CustomIsoparser.java
+src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java
 src/main/java/org/openapijsonschematools/schemas/FrozenList.java
 src/main/java/org/openapijsonschematools/schemas/FrozenMap.java
+src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java
 src/main/java/org/openapijsonschematools/schemas/JsonSchema.java
-src/main/java/org/openapijsonschematools/schemas/JsonSchemas.java
+src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java
 src/main/java/org/openapijsonschematools/schemas/PathToSchemasMap.java
 src/main/java/org/openapijsonschematools/schemas/PathToTypeMap.java
 src/main/java/org/openapijsonschematools/schemas/SchemaValidator.java
+src/main/java/org/openapijsonschematools/schemas/StringJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java
+src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java
 src/main/java/org/openapijsonschematools/schemas/ValidationMetadata.java
 src/main/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidator.java
 src/main/java/org/openapijsonschematools/schemas/validators/FakeValidator.java
@@ -368,6 +385,7 @@ src/test/java/org/openapijsonschematools/schemas/MapSchemaTest.java
 src/test/java/org/openapijsonschematools/schemas/NullSchemaTest.java
 src/test/java/org/openapijsonschematools/schemas/NumberSchemaTest.java
 src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java
+src/test/java/org/openapijsonschematools/schemas/RefBooleanSchemaTest.java
 src/test/java/org/openapijsonschematools/schemas/SchemaValidatorTest.java
 src/test/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidatorTest.java
 src/test/java/org/openapijsonschematools/schemas/validators/FormatValidatorTest.java

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/int32jsoncontenttypeheader/content/applicationjson/Int32JsonContentTypeHeaderSchema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.headers.int32jsoncontenttypeheader.content.applicationjson;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
@@ -18,13 +35,6 @@ public class Int32JsonContentTypeHeaderSchema {
     // nest classes so all schemas and input/output classes can be public
 
 
-    public class Int32JsonContentTypeHeaderSchema1 implements JsonSchema {
-        public static Integer validate(Integer arg, SchemaConfiguration configuration) {
-            return JsonSchema.validate(JsonSchemas.Int32Schema.class, arg, configuration);
-        }
-
-        public static Integer validate(Float arg, SchemaConfiguration configuration) {
-            return JsonSchema.validate(JsonSchemas.Int32Schema.class, Integer.parseInt(arg.toString()), configuration);
-        }
+    public class Int32JsonContentTypeHeaderSchema1 extends Int32JsonSchema {
     }
 }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/numberheader/NumberHeaderSchema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.headers.numberheader;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.headers.refcontentschemaheader.content.applicationjson;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
@@ -15,13 +32,10 @@
 import java.util.Set;
 import org.openapijsonschematools.components.schemas.StringWithValidation;
 
-public class RefContentSchemaHeaderSchema {
+public class RefContentSchemaHeaderSchema extends StringWithValidation {
     // $refed class
 
 
-    public class RefContentSchemaHeaderSchema1 implements JsonSchema {
-        public static String validate(String arg, SchemaConfiguration configuration) {
-            return JsonSchema.validate(StringWithValidation.StringWithValidation1.class, arg, configuration);
-        }
+    public class RefContentSchemaHeaderSchema1 extends StringWithValidation1 {
     }
 }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refschemaheader/RefSchemaHeaderSchema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.headers.refschemaheader;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
@@ -15,13 +32,10 @@
 import java.util.Set;
 import org.openapijsonschematools.components.schemas.StringWithValidation;
 
-public class RefSchemaHeaderSchema {
+public class RefSchemaHeaderSchema extends StringWithValidation {
     // $refed class
 
 
-    public class RefSchemaHeaderSchema1 implements JsonSchema {
-        public static String validate(String arg, SchemaConfiguration configuration) {
-            return JsonSchema.validate(StringWithValidation.StringWithValidation1.class, arg, configuration);
-        }
+    public class RefSchemaHeaderSchema1 extends StringWithValidation1 {
     }
 }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/stringheader/StringHeaderSchema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.headers.stringheader;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/Schema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.parameters.componentrefschemastringwithvalidation.content.applicationjson;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
@@ -15,13 +32,10 @@
 import java.util.Set;
 import org.openapijsonschematools.components.schemas.StringWithValidation;
 
-public class Schema {
+public class Schema extends StringWithValidation {
     // $refed class
 
 
-    public class Schema1 implements JsonSchema {
-        public static String validate(String arg, SchemaConfiguration configuration) {
-            return JsonSchema.validate(StringWithValidation.StringWithValidation1.class, arg, configuration);
-        }
+    public class Schema1 extends StringWithValidation1 {
     }
 }

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/pathusername/Schema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.parameters.pathusername;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/refschemastringwithvalidation/Schema.java

@@ -1,9 +1,26 @@
 package org.openapijsonschematools.components.parameters.refschemastringwithvalidation;
 import org.openapijsonschematools.configurations.SchemaConfiguration;
-import org.openapijsonschematools.schemas.JsonSchema;
-import org.openapijsonschematools.schemas.JsonSchemas;
+import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.BooleanJsonSchema;
+import org.openapijsonschematools.schemas.DateJsonSchema;
+import org.openapijsonschematools.schemas.DateTimeJsonSchema;
+import org.openapijsonschematools.schemas.DecimalJsonSchema;
+import org.openapijsonschematools.schemas.DoubleJsonSchema;
+import org.openapijsonschematools.schemas.FloatJsonSchema;
 import org.openapijsonschematools.schemas.FrozenList;
 import org.openapijsonschematools.schemas.FrozenMap;
+import org.openapijsonschematools.schemas.Int32JsonSchema;
+import org.openapijsonschematools.schemas.Int64JsonSchema;
+import org.openapijsonschematools.schemas.IntJsonSchema;
+import org.openapijsonschematools.schemas.JsonSchema;
+import org.openapijsonschematools.schemas.ListJsonSchema;
+import org.openapijsonschematools.schemas.MapJsonSchema;
+import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.NullJsonSchema;
+import org.openapijsonschematools.schemas.NumberJsonSchema;
+import org.openapijsonschematools.schemas.StringJsonSchema;
+import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
+import org.openapijsonschematools.schemas.UuidJsonSchema;
 
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
@@ -15,13 +32,10 @@
 import java.util.Set;
 import org.openapijsonschematools.components.schemas.StringWithValidation;
 
-public class Schema {
+public class Schema extends StringWithValidation {
     // $refed class
 
 
-    public class Schema1 implements JsonSchema {
-        public static String validate(String arg, SchemaConfiguration configuration) {
-            return JsonSchema.validate(StringWithValidation.StringWithValidation1.class, arg, configuration);
-        }
+    public class Schema1 extends StringWithValidation1 {
     }
 }