diff --git a/docs/generators/java.md b/docs/generators/java.md index 9e742144ba3..b1016c0a99e 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -321,8 +321,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl | Name | Supported | Defined By | | ---- | --------- | ---------- | |AdditionalProperties|✗|OAS2,OAS3 -|AllOf|✗|OAS2,OAS3 -|AnyOf|✗|OAS3 +|AllOf|✓|OAS2,OAS3 +|AnyOf|✓|OAS3 |Const|✗|OAS3 |Contains|✗|OAS3 |Default|✗|OAS2,OAS3 @@ -347,9 +347,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl |MinProperties|✓|OAS2,OAS3 |Minimum|✓|OAS2,OAS3 |MultipleOf|✓|OAS2,OAS3 -|Not|✗|OAS3 +|Not|✓|OAS3 |Nullable|✗|OAS3 -|OneOf|✗|OAS3 +|OneOf|✓|OAS3 |Pattern|✓|OAS2,OAS3 |PatternProperties|✗|OAS3 |PrefixItems|✗|OAS3 diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/int32jsoncontenttypeheader/content/applicationjson/Int32JsonContentTypeHeaderSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/int32jsoncontenttypeheader/content/applicationjson/Int32JsonContentTypeHeaderSchema.java index f10bc6161e3..d5f54c5c416 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/int32jsoncontenttypeheader/content/applicationjson/Int32JsonContentTypeHeaderSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/int32jsoncontenttypeheader/content/applicationjson/Int32JsonContentTypeHeaderSchema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.components.headers.int32jsoncontenttypeheader.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Int32JsonContentTypeHeaderSchema { // nest classes so all schemas and input/output classes can be public - public class Int32JsonContentTypeHeaderSchema1 extends Int32JsonSchema { - } + public class Int32JsonContentTypeHeaderSchema1 extends Int32JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/numberheader/NumberHeaderSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/numberheader/NumberHeaderSchema.java index 1d2c964b2d4..c54d4cbd7ee 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/numberheader/NumberHeaderSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/numberheader/NumberHeaderSchema.java @@ -1,46 +1,9 @@ package org.openapijsonschematools.components.headers.numberheader; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class NumberHeaderSchema { // nest classes so all schemas and input/output classes can be public - public class NumberHeaderSchema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "number"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(NumberHeaderSchema1.class, arg, configuration); - } - }} + public class NumberHeaderSchema1 extends DecimalJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java index 944299ad087..151304c4029 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.components.headers.refcontentschemaheader.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringWithValidation; public class RefContentSchemaHeaderSchema extends StringWithValidation { // $refed class - public class RefContentSchemaHeaderSchema1 extends StringWithValidation1 { - } + public class RefContentSchemaHeaderSchema1 extends StringWithValidation1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refschemaheader/RefSchemaHeaderSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refschemaheader/RefSchemaHeaderSchema.java index 218dd7a68d1..32c64b0e8c2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refschemaheader/RefSchemaHeaderSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/refschemaheader/RefSchemaHeaderSchema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.components.headers.refschemaheader; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringWithValidation; public class RefSchemaHeaderSchema extends StringWithValidation { // $refed class - public class RefSchemaHeaderSchema1 extends StringWithValidation1 { - } + public class RefSchemaHeaderSchema1 extends StringWithValidation1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/stringheader/StringHeaderSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/stringheader/StringHeaderSchema.java index e9f7a0c7e23..a0a4c274258 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/stringheader/StringHeaderSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/headers/stringheader/StringHeaderSchema.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.components.headers.stringheader; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class StringHeaderSchema { // nest classes so all schemas and input/output classes can be public - public class StringHeaderSchema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(StringHeaderSchema1.class, arg, configuration); - } - }} + public class StringHeaderSchema1 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/Schema.java index 00d56090184..fc8515983f6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/componentrefschemastringwithvalidation/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.components.parameters.componentrefschemastringwithvalidation.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringWithValidation; public class Schema extends StringWithValidation { // $refed class - public class Schema1 extends StringWithValidation1 { - } + public class Schema1 extends StringWithValidation1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/pathusername/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/pathusername/Schema.java index 281b6716eeb..1310b11d73a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/pathusername/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/pathusername/Schema.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.components.parameters.pathusername; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema1.class, arg, configuration); - } - }} + public class Schema1 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/refschemastringwithvalidation/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/refschemastringwithvalidation/Schema.java index 6dc782b1ccb..ed607959c7f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/refschemastringwithvalidation/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/parameters/refschemastringwithvalidation/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.components.parameters.refschemastringwithvalidation; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringWithValidation; public class Schema extends StringWithValidation { // $refed class - public class Schema1 extends StringWithValidation1 { - } + public class Schema1 extends StringWithValidation1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/client/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/client/content/applicationjson/Schema.java index 60977ab8963..969987211e3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/client/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/client/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.components.requestbodies.client.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Client; public class Schema extends Client { // $refed class - public class Schema1 extends Client1 { - } + public class Schema1 extends Client1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationjson/Schema.java index 757cb8c66e2..58dbf174a9c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.components.requestbodies.pet.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Pet; public class Schema extends Pet { // $refed class - public class Schema1 extends Pet1 { - } + public class Schema1 extends Pet1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationxml/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationxml/Schema.java index 0afb22d2f54..71da318e804 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationxml/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/pet/content/applicationxml/Schema.java @@ -1,35 +1,5 @@ package org.openapijsonschematools.components.requestbodies.pet.content.applicationxml; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Pet; import org.openapijsonschematools.components.schemas.RefPet; @@ -37,6 +7,5 @@ public class Schema extends RefPet { // $refed class - public class Schema1 extends Pet1 { - } + public class Schema1 extends Pet1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/userarray/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/userarray/content/applicationjson/Schema.java index 43487027a0c..1245ef57219 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/userarray/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/userarray/content/applicationjson/Schema.java @@ -1,36 +1,11 @@ package org.openapijsonschematools.components.requestbodies.userarray.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.schemas.User; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/Headers.java index 32006e0bb73..d258891039b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/Headers.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.components.responses.headerswithnobody; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.responses.headerswithnobody.headers.location.LocationSchema; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class Headers { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class Headers1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/headers/location/LocationSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/headers/location/LocationSchema.java index 0b30fbaaabb..037cbc33688 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/headers/location/LocationSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/headers/location/LocationSchema.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.components.responses.headerswithnobody.headers.location; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class LocationSchema { // nest classes so all schemas and input/output classes can be public - public class LocationSchema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(LocationSchema1.class, arg, configuration); - } - }} + public class LocationSchema1 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java index b587f16beac..ee9176dec38 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java @@ -1,37 +1,12 @@ package org.openapijsonschematools.components.responses.successfulxmlandjsonarrayofpet.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.schemas.Pet; import org.openapijsonschematools.components.schemas.RefPet; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationxml/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationxml/Schema.java index 767ecfc2b75..91336cac1dc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationxml/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationxml/Schema.java @@ -1,36 +1,11 @@ package org.openapijsonschematools.components.responses.successfulxmlandjsonarrayofpet.content.applicationxml; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.schemas.Pet; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java index 1329ca95f82..f17b9108e17 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.components.responses.successinlinecontentandheader; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.responses.successinlinecontentandheader.headers.someheader.SomeHeaderSchema; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class Headers { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class Headers1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java index 83544bc071d..a13ea71ca15 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java @@ -1,42 +1,17 @@ package org.openapijsonschematools.components.responses.successinlinecontentandheader.content.applicationjson; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties extends Int32JsonSchema { - } + public class AdditionalProperties extends Int32JsonSchema {} public class Schema1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/headers/someheader/SomeHeaderSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/headers/someheader/SomeHeaderSchema.java index dee7d6cda9f..ca9f85501b3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/headers/someheader/SomeHeaderSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/headers/someheader/SomeHeaderSchema.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.components.responses.successinlinecontentandheader.headers.someheader; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class SomeHeaderSchema { // nest classes so all schemas and input/output classes can be public - public class SomeHeaderSchema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(SomeHeaderSchema1.class, arg, configuration); - } - }} + public class SomeHeaderSchema1 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java index 7146accade5..dfe94829897 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java @@ -1,47 +1,25 @@ package org.openapijsonschematools.components.responses.successwithjsonapiresponse; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.headers.int32jsoncontenttypeheader.content.applicationjson.Int32JsonContentTypeHeaderSchema; import org.openapijsonschematools.components.headers.numberheader.NumberHeaderSchema; import org.openapijsonschematools.components.headers.stringheader.StringHeaderSchema; import org.openapijsonschematools.components.schemas.StringWithValidation; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class Headers { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class Headers1 implements JsonSchema { @@ -60,7 +38,8 @@ public class Headers1 implements JsonSchema { "ref-content-schema-header", "ref-schema-header", "stringHeader" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Headers1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/content/applicationjson/Schema.java index 5e4b2245a08..111b90f504b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.components.responses.successwithjsonapiresponse.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ApiResponseSchema; public class Schema extends ApiResponseSchema { // $refed class - public class Schema1 extends ApiResponseSchema1 { - } + public class Schema1 extends ApiResponseSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java index edb006ec6d4..f64d98f1408 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class AbstractStepMessage { // nest classes so all schemas and input/output classes can be public - public class Discriminator implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Discriminator.class, arg, configuration); - } - } + public class Discriminator extends StringJsonSchema {} + public class AbstractStepMessage1 implements JsonSchema { /* @@ -63,7 +35,8 @@ public class AbstractStepMessage1 implements JsonSchema { "description", "discriminator", "sequenceNumber" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AbstractStepMessage1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesClass.java index 9ad2d2b4b20..37e3e592595 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesClass.java @@ -1,48 +1,23 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class AdditionalPropertiesClass { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalProperties.class, arg, configuration); - } - } + public class AdditionalProperties extends StringJsonSchema {} + public class MapProperty implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -55,14 +30,8 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalProperties2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalProperties2.class, arg, configuration); - } - } + public class AdditionalProperties2 extends StringJsonSchema {} + public class AdditionalProperties1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -86,20 +55,16 @@ public static T validate(Map arg, SchemaCo } - public class Anytype1 extends AnyTypeJsonSchema { - } + public class Anytype1 extends AnyTypeJsonSchema {} - public class MapWithUndeclaredPropertiesAnytype1 extends MapJsonSchema { - } + public class MapWithUndeclaredPropertiesAnytype1 extends MapJsonSchema {} - public class MapWithUndeclaredPropertiesAnytype2 extends MapJsonSchema { - } + public class MapWithUndeclaredPropertiesAnytype2 extends MapJsonSchema {} - public class AdditionalProperties3 extends AnyTypeJsonSchema { - } + public class AdditionalProperties3 extends AnyTypeJsonSchema {} public class MapWithUndeclaredPropertiesAnytype3 implements JsonSchema { @@ -113,9 +78,8 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalProperties4 implements JsonSchema { + public class AdditionalProperties4 extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class EmptyMap implements JsonSchema { @@ -129,14 +93,8 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalProperties5 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalProperties5.class, arg, configuration); - } - } + public class AdditionalProperties5 extends StringJsonSchema {} + public class MapWithUndeclaredPropertiesString implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesValidator.java index 0ce2166500e..b648297c8d0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesValidator.java @@ -1,42 +1,22 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class AdditionalPropertiesValidator { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties extends AnyTypeJsonSchema { - } + public class AdditionalProperties extends AnyTypeJsonSchema {} public class Schema0 implements JsonSchema { @@ -87,6 +67,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(AdditionalProperties1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(AdditionalProperties1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties1.class, arg, configuration); } @@ -144,6 +128,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(AdditionalProperties2.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(AdditionalProperties2.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties2.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesWithArrayOfEnums.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesWithArrayOfEnums.java index 62cbe45324d..3467a75e2ae 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesWithArrayOfEnums.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesWithArrayOfEnums.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class AdditionalPropertiesWithArrayOfEnums { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Address.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Address.java index 4cb0ba2720a..e222fe1a233 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Address.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Address.java @@ -1,42 +1,17 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Address { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties extends IntJsonSchema { - } + public class AdditionalProperties extends IntJsonSchema {} public class Address1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Animal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Animal.java index e0724d73658..1a3835274bf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Animal.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Animal.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Animal { // nest classes so all schemas and input/output classes can be public - public class ClassName implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ClassName.class, arg, configuration); - } - } + public class ClassName extends StringJsonSchema {} + public class Color implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -69,7 +41,8 @@ public class Animal1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "className" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Animal1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnimalFarm.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnimalFarm.java index 03d7abc6e10..6080f078ea1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnimalFarm.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnimalFarm.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class AnimalFarm { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeAndFormat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeAndFormat.java index 0bb0e6098c5..8c9a56b27fa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeAndFormat.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeAndFormat.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class AnyTypeAndFormat { // nest classes so all schemas and input/output classes can be public @@ -73,6 +55,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(UuidSchema.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(UuidSchema.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(UuidSchema.class, arg, configuration); } @@ -120,6 +106,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Date.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Date.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Date.class, arg, configuration); } @@ -167,6 +157,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Datetime.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Datetime.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Datetime.class, arg, configuration); } @@ -214,6 +208,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(NumberSchema.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(NumberSchema.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(NumberSchema.class, arg, configuration); } @@ -261,6 +259,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Binary.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Binary.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Binary.class, arg, configuration); } @@ -308,6 +310,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Int32.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Int32.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Int32.class, arg, configuration); } @@ -355,6 +361,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Int64.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Int64.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Int64.class, arg, configuration); } @@ -402,6 +412,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(DoubleSchema.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(DoubleSchema.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(DoubleSchema.class, arg, configuration); } @@ -449,6 +463,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(FloatSchema.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(FloatSchema.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(FloatSchema.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeNotString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeNotString.java index 25637984dae..8493d596284 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeNotString.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeNotString.java @@ -1,48 +1,21 @@ package org.openapijsonschematools.components.schemas; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class AnyTypeNotString { // nest classes so all schemas and input/output classes can be public - public class Not implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Not.class, arg, configuration); - } - } + public class Not extends StringJsonSchema {} + public class AnyTypeNotString1 implements JsonSchema { /* @@ -87,6 +60,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(AnyTypeNotString1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(AnyTypeNotString1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeNotString1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ApiResponseSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ApiResponseSchema.java index 79bcff67947..f7306544b2b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ApiResponseSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ApiResponseSchema.java @@ -1,61 +1,27 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int32JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ApiResponseSchema { // nest classes so all schemas and input/output classes can be public - public class Code extends Int32JsonSchema { - } + public class Code extends Int32JsonSchema {} - public class Type implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Type.class, arg, configuration); - } - } + public class Type extends StringJsonSchema {} + + + public class Message extends StringJsonSchema {} - public class Message implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Message.class, arg, configuration); - } - } public class ApiResponseSchema1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Apple.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Apple.java index a4e50077dd6..cd9c21f3df8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Apple.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Apple.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Apple { // nest classes so all schemas and input/output classes can be public @@ -70,7 +47,8 @@ public class Apple1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "cultivar" - )); public static Void validate(Void arg, SchemaConfiguration configuration) { + )); + public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Apple1.class, arg, configuration); } public static T validate(Map arg, SchemaConfiguration configuration) { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AppleReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AppleReq.java index 0a44ebf6e7d..d6e2da71e16 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AppleReq.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AppleReq.java @@ -1,56 +1,29 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class AppleReq { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class Cultivar implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Cultivar.class, arg, configuration); - } - } + public class Cultivar extends StringJsonSchema {} - public class Mealy extends BooleanJsonSchema { - } + + public class Mealy extends BooleanJsonSchema {} public class AppleReq1 implements JsonSchema { @@ -69,7 +42,8 @@ public class AppleReq1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "cultivar" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AppleReq1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayHoldingAnyType.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayHoldingAnyType.java index 7f48d38c5d0..5af7c265cd2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayHoldingAnyType.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayHoldingAnyType.java @@ -1,85 +1,18 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ArrayHoldingAnyType { // nest classes so all schemas and input/output classes can be public - public class Items implements JsonSchema { - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static Integer validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static Float validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static Double validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static T validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - - public static U validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - } + public class Items extends AnyTypeJsonSchema {} + public class ArrayHoldingAnyType1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java index d4514c2b72c..eedbb50c0d6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java @@ -1,42 +1,21 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NumberJsonSchema; public class ArrayOfArrayOfNumberOnly { // nest classes so all schemas and input/output classes can be public - public class Items1 extends DoubleJsonSchema { - } + public class Items1 extends NumberJsonSchema {} public class Items implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfEnums.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfEnums.java index 5a611bce4eb..d9ba5c570f0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfEnums.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfEnums.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class ArrayOfEnums { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfNumberOnly.java index 2dee5587f93..e1235cb8247 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfNumberOnly.java @@ -1,42 +1,21 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NumberJsonSchema; public class ArrayOfNumberOnly { // nest classes so all schemas and input/output classes can be public - public class Items extends DoubleJsonSchema { - } + public class Items extends NumberJsonSchema {} public class ArrayNumber implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayTest.java index eebc3328459..ffe4cc391ca 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayTest.java @@ -1,48 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int64JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ArrayTest { // nest classes so all schemas and input/output classes can be public - public class Items implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - } + public class Items extends StringJsonSchema {} + public class ArrayOfString implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -54,8 +29,7 @@ public static U validate(List arg, SchemaConfigur } } - public class Items2 extends Int64JsonSchema { - } + public class Items2 extends Int64JsonSchema {} public class Items1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayWithValidationsInItems.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayWithValidationsInItems.java index c10bc5cc993..49d690f17a9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayWithValidationsInItems.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayWithValidationsInItems.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class ArrayWithValidationsInItems { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Banana.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Banana.java index d4917f6e373..6064e7e37a7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Banana.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Banana.java @@ -1,42 +1,19 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NumberJsonSchema; public class Banana { // nest classes so all schemas and input/output classes can be public - public class LengthCm extends DoubleJsonSchema { - } + public class LengthCm extends NumberJsonSchema {} public class Banana1 implements JsonSchema { @@ -54,7 +31,8 @@ public class Banana1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "lengthCm" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Banana1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BananaReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BananaReq.java index 0e505c4002f..011893e5237 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BananaReq.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BananaReq.java @@ -1,51 +1,29 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class BananaReq { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class LengthCm extends DoubleJsonSchema { - } + public class LengthCm extends NumberJsonSchema {} - public class Sweet extends BooleanJsonSchema { - } + public class Sweet extends BooleanJsonSchema {} public class BananaReq1 implements JsonSchema { @@ -64,7 +42,8 @@ public class BananaReq1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "lengthCm" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(BananaReq1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Bar.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Bar.java index f528675a347..96475e04d91 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Bar.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Bar.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Bar { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BasquePig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BasquePig.java index 7f6ed5ab201..573505ec11e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BasquePig.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BasquePig.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class BasquePig { // nest classes so all schemas and input/output classes can be public @@ -59,7 +36,8 @@ public class BasquePig1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "className" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(BasquePig1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanEnum.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanEnum.java index 5a34cb088a7..00dcff338fb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanEnum.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanEnum.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class BooleanEnum { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanSchema.java index 51e1579ea0d..a40a6095823 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanSchema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class BooleanSchema { // nest classes so all schemas and input/output classes can be public - public class BooleanSchema1 extends BooleanJsonSchema { - } + public class BooleanSchema1 extends BooleanJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java index 990e23c70a5..c59d2cf4dec 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java @@ -1,93 +1,35 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Capitalization { // nest classes so all schemas and input/output classes can be public - public class SmallCamel implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(SmallCamel.class, arg, configuration); - } - } + public class SmallCamel extends StringJsonSchema {} - public class CapitalCamel implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(CapitalCamel.class, arg, configuration); - } - } - public class SmallSnake implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(SmallSnake.class, arg, configuration); - } - } + public class CapitalCamel extends StringJsonSchema {} - public class CapitalSnake implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(CapitalSnake.class, arg, configuration); - } - } - public class SCAETHFlowPoints implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(SCAETHFlowPoints.class, arg, configuration); - } - } + public class SmallSnake extends StringJsonSchema {} + + + public class CapitalSnake extends StringJsonSchema {} + + + public class SCAETHFlowPoints extends StringJsonSchema {} + + + public class ATTNAME extends StringJsonSchema {} - public class ATTNAME implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ATTNAME.class, arg, configuration); - } - } public class Capitalization1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Cat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Cat.java index e601242a077..6856411f153 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Cat.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Cat.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,13 +7,18 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.BooleanJsonSchema; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Cat { // nest classes so all schemas and input/output classes can be public - public class Declawed extends BooleanJsonSchema { - } + public class Declawed extends BooleanJsonSchema {} public class Schema1 implements JsonSchema { @@ -95,6 +77,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Cat1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Cat1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Cat1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Category.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Category.java index 590fff55549..d5e75cf0b86 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Category.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Category.java @@ -1,42 +1,19 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int64JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; public class Category { // nest classes so all schemas and input/output classes can be public - public class Id extends Int64JsonSchema { - } + public class Id extends Int64JsonSchema {} public class Name implements JsonSchema { @@ -64,7 +41,8 @@ public class Category1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "name" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Category1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ChildCat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ChildCat.java index 1331f8c5b3b..217ff7a492f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ChildCat.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ChildCat.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,19 +7,19 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ChildCat { // nest classes so all schemas and input/output classes can be public - public class Name implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Name.class, arg, configuration); - } - } + public class Name extends StringJsonSchema {} + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -100,6 +77,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ChildCat1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ChildCat1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ChildCat1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ClassModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ClassModel.java index 7b1c35d1ee3..35265a977a3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ClassModel.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ClassModel.java @@ -1,48 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ClassModel { // nest classes so all schemas and input/output classes can be public - public class ClassSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ClassSchema.class, arg, configuration); - } - } + public class ClassSchema extends StringJsonSchema {} + public class ClassModel1 implements JsonSchema { /* @@ -92,6 +67,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ClassModel1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ClassModel1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ClassModel1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Client.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Client.java index 75fe0563984..15bfeae2847 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Client.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Client.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Client { // nest classes so all schemas and input/output classes can be public - public class Client2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Client2.class, arg, configuration); - } - } + public class Client2 extends StringJsonSchema {} + public class Client1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComplexQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComplexQuadrilateral.java index 12c1cf4c025..8850c1ed454 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComplexQuadrilateral.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComplexQuadrilateral.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ComplexQuadrilateral { // nest classes so all schemas and input/output classes can be public @@ -100,6 +82,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ComplexQuadrilateral1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ComplexQuadrilateral1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ComplexQuadrilateral1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedAnyOfDifferentTypesNoValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedAnyOfDifferentTypesNoValidations.java index 7c724e12718..3f2a9180454 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedAnyOfDifferentTypesNoValidations.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedAnyOfDifferentTypesNoValidations.java @@ -1,10 +1,16 @@ package org.openapijsonschematools.components.schemas; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; @@ -13,100 +19,45 @@ 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedAnyOfDifferentTypesNoValidations { // nest classes so all schemas and input/output classes can be public - public class Schema0 extends MapJsonSchema { - } + public class Schema0 extends MapJsonSchema {} - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema1.class, arg, configuration); - } - } + public class Schema1 extends DateJsonSchema {} + + + public class Schema2 extends DateTimeJsonSchema {} - public class Schema2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date-time"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema2.class, arg, configuration); - } - } public class Schema3 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - } + // BinarySchema + } - public class Schema4 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "byte"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema4.class, arg, configuration); - } - } - public class Schema5 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema5.class, arg, configuration); - } - } + public class Schema4 extends StringJsonSchema {} - public class Schema6 extends MapJsonSchema { - } + public class Schema5 extends StringJsonSchema {} - public class Schema7 extends BooleanJsonSchema { - } + public class Schema6 extends MapJsonSchema {} - public class Schema8 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema8.class, arg, configuration); - } - } - public class Items extends AnyTypeJsonSchema { - } + public class Schema7 extends BooleanJsonSchema {} + + + public class Schema8 extends NullJsonSchema {} + + + public class Items extends AnyTypeJsonSchema {} public class Schema9 implements JsonSchema { @@ -119,27 +70,22 @@ public static U validate(List arg, SchemaConfigur } } - public class Schema10 extends DoubleJsonSchema { - } + public class Schema10 extends NumberJsonSchema {} - public class Schema11 extends FloatJsonSchema { - } + public class Schema11 extends FloatJsonSchema {} - } + public class Schema12 extends DoubleJsonSchema {} - public class Schema13 extends IntJsonSchema { - } + public class Schema13 extends IntJsonSchema {} - public class Schema14 extends Int32JsonSchema { - } + public class Schema14 extends Int32JsonSchema {} - public class Schema15 extends Int64JsonSchema { - } + public class Schema15 extends Int64JsonSchema {} public class ComposedAnyOfDifferentTypesNoValidations1 implements JsonSchema { @@ -185,6 +131,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ComposedAnyOfDifferentTypesNoValidations1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ComposedAnyOfDifferentTypesNoValidations1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ComposedAnyOfDifferentTypesNoValidations1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedArray.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedArray.java index a58caad4b07..c85b3e2e354 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedArray.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedArray.java @@ -1,42 +1,17 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedArray { // nest classes so all schemas and input/output classes can be public - public class Items extends AnyTypeJsonSchema { - } + public class Items extends AnyTypeJsonSchema {} public class ComposedArray1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedBool.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedBool.java index e60deea67f7..99ccf357c0f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedBool.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedBool.java @@ -1,42 +1,15 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedBool { // nest classes so all schemas and input/output classes can be public - public class Schema0 extends AnyTypeJsonSchema { - } + public class Schema0 extends AnyTypeJsonSchema {} public class ComposedBool1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNone.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNone.java index 27f5d249514..6fc17f12d1c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNone.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNone.java @@ -1,42 +1,15 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedNone { // nest classes so all schemas and input/output classes can be public - public class Schema0 extends AnyTypeJsonSchema { - } + public class Schema0 extends AnyTypeJsonSchema {} public class ComposedNone1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNumber.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNumber.java index 22678065725..04821c3a958 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNumber.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNumber.java @@ -1,42 +1,15 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedNumber { // nest classes so all schemas and input/output classes can be public - public class Schema0 extends AnyTypeJsonSchema { - } + public class Schema0 extends AnyTypeJsonSchema {} public class ComposedNumber1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedObject.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedObject.java index 220895e066c..e5c49f7af62 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedObject.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedObject.java @@ -1,42 +1,17 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedObject { // nest classes so all schemas and input/output classes can be public - public class Schema0 extends AnyTypeJsonSchema { - } + public class Schema0 extends AnyTypeJsonSchema {} public class ComposedObject1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedOneOfDifferentTypes.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedOneOfDifferentTypes.java index e3261a01b66..b870693ee07 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedOneOfDifferentTypes.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedOneOfDifferentTypes.java @@ -1,58 +1,28 @@ package org.openapijsonschematools.components.schemas; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedOneOfDifferentTypes { // nest classes so all schemas and input/output classes can be public - public class Schema2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema2.class, arg, configuration); - } - } + public class Schema2 extends NullJsonSchema {} + + + public class Schema3 extends DateJsonSchema {} - public class Schema3 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema3.class, arg, configuration); - } - } public class Schema4 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -64,8 +34,7 @@ public static T validate(Map arg, SchemaCo } - public class Items extends AnyTypeJsonSchema { - } + public class Items extends AnyTypeJsonSchema {} public class Schema5 implements JsonSchema { @@ -133,6 +102,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ComposedOneOfDifferentTypes1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ComposedOneOfDifferentTypes1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ComposedOneOfDifferentTypes1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedString.java index 959c43464bd..697227e728c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedString.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedString.java @@ -1,42 +1,15 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ComposedString { // nest classes so all schemas and input/output classes can be public - public class Schema0 extends AnyTypeJsonSchema { - } + public class Schema0 extends AnyTypeJsonSchema {} public class ComposedString1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Currency.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Currency.java index 41aae1cf369..534e6ea6454 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Currency.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Currency.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Currency { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DanishPig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DanishPig.java index 1c2a6991acc..f0a04ffc24a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DanishPig.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DanishPig.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class DanishPig { // nest classes so all schemas and input/output classes can be public @@ -59,7 +36,8 @@ public class DanishPig1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "className" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(DanishPig1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeTest.java index 9e3e8be8e13..4c3045af39e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeTest.java @@ -1,35 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class DateTimeTest { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeWithValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeWithValidations.java index a15a197fad1..bbb9e784f3b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeWithValidations.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeWithValidations.java @@ -1,35 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class DateTimeWithValidations { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateWithValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateWithValidations.java index 78c52ac03cd..c8495a68938 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateWithValidations.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateWithValidations.java @@ -1,35 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class DateWithValidations { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DecimalPayload.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DecimalPayload.java index 9a7507eaa3f..339864e872e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DecimalPayload.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DecimalPayload.java @@ -1,52 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class DecimalPayload { // nest classes so all schemas and input/output classes can be public - public class DecimalPayload1 implements JsonSchema { - /* - 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. - */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "number"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(DecimalPayload1.class, arg, configuration); - } - }} + public class DecimalPayload1 extends DecimalJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java index 88b91a16247..54023ef9c9e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,19 +7,19 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Dog { // nest classes so all schemas and input/output classes can be public - public class Breed implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Breed.class, arg, configuration); - } - } + public class Breed extends StringJsonSchema {} + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -100,6 +77,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Dog1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Dog1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Dog1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Drawing.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Drawing.java index b3059b3cf0e..8c81bad4408 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Drawing.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Drawing.java @@ -1,35 +1,14 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Drawing { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumArrays.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumArrays.java index 0e2bdc7efdc..3f71c9743bb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumArrays.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumArrays.java @@ -1,35 +1,14 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class EnumArrays { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumClass.java index e0ea2901297..ada2b9d4825 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumClass.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class EnumClass { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumTest.java index e3b9e0b3aa5..48648244be0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumTest.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class EnumTest { // nest classes so all schemas and input/output classes can be public @@ -114,7 +91,8 @@ public class EnumTest1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "enum_string_required" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(EnumTest1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EquilateralTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EquilateralTriangle.java index 47f17741c61..fc304ea9f73 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EquilateralTriangle.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EquilateralTriangle.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class EquilateralTriangle { // nest classes so all schemas and input/output classes can be public @@ -100,6 +82,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(EquilateralTriangle1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(EquilateralTriangle1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(EquilateralTriangle1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/File.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/File.java index dce01f2acba..4d36a631484 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/File.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/File.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class File { // nest classes so all schemas and input/output classes can be public - public class SourceURI implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(SourceURI.class, arg, configuration); - } - } + public class SourceURI extends StringJsonSchema {} + public class File1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FileSchemaTestClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FileSchemaTestClass.java index 2d26a7bd5db..65a0de5fedd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FileSchemaTestClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FileSchemaTestClass.java @@ -1,35 +1,14 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class FileSchemaTestClass { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Foo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Foo.java index 127f80937c6..b15bfec449a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Foo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Foo.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Foo { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FormatTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FormatTest.java index 3750b54accb..a8b8116c3b9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FormatTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FormatTest.java @@ -1,36 +1,25 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class FormatTest { // nest classes so all schemas and input/output classes can be public @@ -59,8 +48,7 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } - public class Int32 extends Int32JsonSchema { - } + public class Int32 extends Int32JsonSchema {} public class Int32withValidations implements JsonSchema { @@ -88,8 +76,7 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } - public class Int64 extends Int64JsonSchema { - } + public class Int64 extends Int64JsonSchema {} public class NumberSchema implements JsonSchema { @@ -129,8 +116,7 @@ public static Float validate(Float arg, SchemaConfiguration configuration) { } } - public class Float32 extends FloatJsonSchema { - } + public class Float32 extends FloatJsonSchema {} public class DoubleSchema implements JsonSchema { @@ -146,11 +132,10 @@ public static Double validate(Double arg, SchemaConfiguration configuration) { } } - } + public class Float64 extends DoubleJsonSchema {} - public class Items extends DoubleJsonSchema { - } + public class Items extends NumberJsonSchema {} public class ArrayWithUniqueItems implements JsonSchema { @@ -172,65 +157,25 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class ByteSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "byte"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ByteSchema.class, arg, configuration); - } - } + public class ByteSchema extends StringJsonSchema {} + public class Binary implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - } + // BinarySchema + } - public class Date implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Date.class, arg, configuration); - } - } - public class DateTime implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date-time"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(DateTime.class, arg, configuration); - } - } + public class Date extends DateJsonSchema {} - public class UuidSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "uuid"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UuidSchema.class, arg, configuration); - } - } - public class UuidNoExample implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "uuid"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UuidNoExample.class, arg, configuration); - } - } + public class DateTime extends DateTimeJsonSchema {} + + + public class UuidSchema extends UuidJsonSchema {} + + + public class UuidNoExample extends UuidJsonSchema {} + public class Password implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -260,14 +205,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class NoneProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(NoneProp.class, arg, configuration); - } - } + public class NoneProp extends NullJsonSchema {} + public class FormatTest1 implements JsonSchema { /* @@ -307,7 +246,8 @@ public class FormatTest1 implements JsonSchema { "date", "number", "password" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(FormatTest1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FromSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FromSchema.java index a8572b55a1d..603fbd4e715 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FromSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FromSchema.java @@ -1,51 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.IntJsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class FromSchema { // nest classes so all schemas and input/output classes can be public - public class Data implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Data.class, arg, configuration); - } - } + public class Data extends StringJsonSchema {} - public class Id extends IntJsonSchema { - } + + public class Id extends IntJsonSchema {} public class FromSchema1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Fruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Fruit.java index 72c01712330..5de08421f38 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Fruit.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Fruit.java @@ -1,48 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Fruit { // nest classes so all schemas and input/output classes can be public - public class Color implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Color.class, arg, configuration); - } - } + public class Color extends StringJsonSchema {} + public class Fruit1 implements JsonSchema { /* @@ -90,6 +65,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Fruit1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Fruit1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Fruit1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FruitReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FruitReq.java index f5be551e38e..161e9d0f13f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FruitReq.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FruitReq.java @@ -1,48 +1,21 @@ package org.openapijsonschematools.components.schemas; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class FruitReq { // nest classes so all schemas and input/output classes can be public - public class Schema0 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema0.class, arg, configuration); - } - } + public class Schema0 extends NullJsonSchema {} + public class FruitReq1 implements JsonSchema { /* @@ -87,6 +60,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(FruitReq1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(FruitReq1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(FruitReq1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GmFruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GmFruit.java index 1138e6f4024..c9fe93630a0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GmFruit.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GmFruit.java @@ -1,48 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class GmFruit { // nest classes so all schemas and input/output classes can be public - public class Color implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Color.class, arg, configuration); - } - } + public class Color extends StringJsonSchema {} + public class GmFruit1 implements JsonSchema { /* @@ -90,6 +65,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(GmFruit1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(GmFruit1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(GmFruit1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GrandparentAnimal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GrandparentAnimal.java index 4310553a0d4..14e1deca98d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GrandparentAnimal.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GrandparentAnimal.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class GrandparentAnimal { // nest classes so all schemas and input/output classes can be public - public class PetType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(PetType.class, arg, configuration); - } - } + public class PetType extends StringJsonSchema {} + public class GrandparentAnimal1 implements JsonSchema { /* @@ -59,7 +31,8 @@ public class GrandparentAnimal1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "pet_type" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(GrandparentAnimal1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HasOnlyReadOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HasOnlyReadOnly.java index e9b79c4f331..bcfc46979a6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HasOnlyReadOnly.java @@ -1,57 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class HasOnlyReadOnly { // nest classes so all schemas and input/output classes can be public - public class Bar implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Bar.class, arg, configuration); - } - } + public class Bar extends StringJsonSchema {} + + + public class Foo extends StringJsonSchema {} - public class Foo implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Foo.class, arg, configuration); - } - } public class HasOnlyReadOnly1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HealthCheckResult.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HealthCheckResult.java index 834bc01743a..5cb6d362943 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HealthCheckResult.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HealthCheckResult.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class HealthCheckResult { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnum.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnum.java index e4cb0a15165..b0fddd3e742 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnum.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnum.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class IntegerEnum { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumBig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumBig.java index eb1f5ad6511..ff40bffd396 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumBig.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumBig.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class IntegerEnumBig { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumOneValue.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumOneValue.java index 4010d5e4d7e..ab9a2eeea88 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumOneValue.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumOneValue.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class IntegerEnumOneValue { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumWithDefaultValue.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumWithDefaultValue.java index 7074b61384e..f16fba4e854 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumWithDefaultValue.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerEnumWithDefaultValue.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class IntegerEnumWithDefaultValue { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMax10.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMax10.java index bec741c1da5..7ce17505f5b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMax10.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMax10.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class IntegerMax10 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMin15.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMin15.java index 018ec988dbf..915af6ac10d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMin15.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IntegerMin15.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class IntegerMin15 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IsoscelesTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IsoscelesTriangle.java index dc7a1d56ae3..6e3e998d223 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IsoscelesTriangle.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IsoscelesTriangle.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class IsoscelesTriangle { // nest classes so all schemas and input/output classes can be public @@ -100,6 +82,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(IsoscelesTriangle1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(IsoscelesTriangle1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(IsoscelesTriangle1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Items.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Items.java index dfa744f6948..2b3300789d0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Items.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Items.java @@ -1,42 +1,17 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Items { // nest classes so all schemas and input/output classes can be public - public class Items2 extends MapJsonSchema { - } + public class Items2 extends MapJsonSchema {} public class Items1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequest.java index 5e454b8c71a..d3f7b85936b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequest.java @@ -1,35 +1,15 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class JSONPatchRequest { // nest classes so all schemas and input/output classes can be public @@ -72,6 +52,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Items.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Items.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestAddReplaceTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestAddReplaceTest.java index 7c72fecbcb5..6df66328776 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestAddReplaceTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestAddReplaceTest.java @@ -1,99 +1,29 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class JSONPatchRequestAddReplaceTest { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class Path implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Path.class, arg, configuration); - } - } + public class Path extends StringJsonSchema {} + + + public class Value extends AnyTypeJsonSchema {} - public class Value implements JsonSchema { - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static Integer validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static Float validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static Double validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static T validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - - public static U validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Value.class, arg, configuration); - } - } public class Op implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -123,7 +53,8 @@ public class JSONPatchRequestAddReplaceTest1 implements JsonSchema { "op", "path", "value" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(JSONPatchRequestAddReplaceTest1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestMoveCopy.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestMoveCopy.java index 2639babc5ac..40cbda6b2c3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestMoveCopy.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestMoveCopy.java @@ -1,62 +1,29 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class JSONPatchRequestMoveCopy { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class From implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(From.class, arg, configuration); - } - } + public class From extends StringJsonSchema {} + + + public class Path extends StringJsonSchema {} - public class Path implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Path.class, arg, configuration); - } - } public class Op implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -86,7 +53,8 @@ public class JSONPatchRequestMoveCopy1 implements JsonSchema { "from", "op", "path" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(JSONPatchRequestMoveCopy1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestRemove.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestRemove.java index 6174063e5e9..a2b18af2168 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestRemove.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestRemove.java @@ -1,53 +1,26 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class JSONPatchRequestRemove { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class Path implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Path.class, arg, configuration); - } - } + public class Path extends StringJsonSchema {} + public class Op implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -75,7 +48,8 @@ public class JSONPatchRequestRemove1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "op", "path" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(JSONPatchRequestRemove1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Mammal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Mammal.java index 4b34817e368..8f88bc48473 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Mammal.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Mammal.java @@ -1,35 +1,13 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Mammal { // nest classes so all schemas and input/output classes can be public @@ -78,6 +56,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Mammal1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Mammal1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Mammal1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java index 7066bc78a25..bb3bb1627b9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java @@ -1,48 +1,21 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.BooleanJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class MapTest { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalProperties1.class, arg, configuration); - } - } + public class AdditionalProperties1 extends StringJsonSchema {} + public class AdditionalProperties implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -86,8 +59,7 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalProperties3 extends BooleanJsonSchema { - } + public class AdditionalProperties3 extends BooleanJsonSchema {} public class DirectMap implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java index c65b40cdf29..adf7cc3eef8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java @@ -1,59 +1,24 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.DateTimeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.UuidJsonSchema; public class MixedPropertiesAndAdditionalPropertiesClass { // nest classes so all schemas and input/output classes can be public - public class UuidSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "uuid"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UuidSchema.class, arg, configuration); - } - } + public class UuidSchema extends UuidJsonSchema {} + + + public class DateTime extends DateTimeJsonSchema {} - public class DateTime implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date-time"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(DateTime.class, arg, configuration); - } - } public class MapSchema implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Money.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Money.java index d8d261d66ff..6a02b403685 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Money.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Money.java @@ -1,54 +1,26 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Money { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class Amount implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "number"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Amount.class, arg, configuration); - } - } + public class Amount extends DecimalJsonSchema {} + public class Money1 implements JsonSchema { /* @@ -67,7 +39,8 @@ public class Money1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "amount", "currency" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Money1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MyObjectDto.java index 21e4967abbf..4498883dae7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MyObjectDto.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MyObjectDto.java @@ -1,54 +1,26 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class MyObjectDto { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class Id implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "uuid"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Id.class, arg, configuration); - } - } + public class Id extends UuidJsonSchema {} + public class MyObjectDto1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Name.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Name.java index 3a590da02c2..a30306f0f39 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Name.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Name.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,27 +7,26 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int32JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Name { // nest classes so all schemas and input/output classes can be public - public class Name2 extends Int32JsonSchema { - } + public class Name2 extends Int32JsonSchema {} - public class SnakeCase extends Int32JsonSchema { - } + public class SnakeCase extends Int32JsonSchema {} - public class Property implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Property.class, arg, configuration); - } - } + public class Property extends StringJsonSchema {} + public class Name1 implements JsonSchema { /* @@ -68,7 +44,8 @@ public class Name1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "name" - )); public static Void validate(Void arg, SchemaConfiguration configuration) { + )); + public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Name1.class, arg, configuration); } @@ -104,6 +81,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Name1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Name1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Name1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NoAdditionalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NoAdditionalProperties.java index 42f28cc1edd..329af335ce6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NoAdditionalProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NoAdditionalProperties.java @@ -1,51 +1,28 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class NoAdditionalProperties { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class Id extends Int64JsonSchema { - } + public class Id extends Int64JsonSchema {} - public class PetId extends Int64JsonSchema { - } + public class PetId extends Int64JsonSchema {} public class NoAdditionalProperties1 implements JsonSchema { @@ -64,7 +41,8 @@ public class NoAdditionalProperties1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "id" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(NoAdditionalProperties1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableClass.java index 94cd34b6fe2..924dd8fa7b2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableClass.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.MapJsonSchema; public class NullableClass { // nest classes so all schemas and input/output classes can be public @@ -158,8 +140,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Items extends MapJsonSchema { - } + public class Items extends MapJsonSchema {} public class ArrayNullableProp implements JsonSchema { @@ -226,8 +207,7 @@ public static U validate(List arg, SchemaConfigur } } - public class AdditionalProperties extends MapJsonSchema { - } + public class AdditionalProperties extends MapJsonSchema {} public class ObjectNullableProp implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableShape.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableShape.java index 47fd6758615..05145a3ba11 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableShape.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableShape.java @@ -1,48 +1,21 @@ package org.openapijsonschematools.components.schemas; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class NullableShape { // nest classes so all schemas and input/output classes can be public - public class Schema2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema2.class, arg, configuration); - } - } + public class Schema2 extends NullJsonSchema {} + public class NullableShape1 implements JsonSchema { /* @@ -89,6 +62,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(NullableShape1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(NullableShape1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(NullableShape1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableString.java index 06754b1a91a..6aed26f1913 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableString.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableString.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class NullableString { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberOnly.java index c6b06137c42..101ae9d01b1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberOnly.java @@ -1,42 +1,19 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NumberJsonSchema; public class NumberOnly { // nest classes so all schemas and input/output classes can be public - public class JustNumber extends DoubleJsonSchema { - } + public class JustNumber extends NumberJsonSchema {} public class NumberOnly1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberSchema.java index db0052bb609..b5de7f2b3d2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberSchema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class NumberSchema { // nest classes so all schemas and input/output classes can be public - public class NumberSchema1 extends DoubleJsonSchema { - } + public class NumberSchema1 extends NumberJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberWithValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberWithValidations.java index d773b571b25..c287285df68 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberWithValidations.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberWithValidations.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class NumberWithValidations { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredProps.java index 888ab1797f7..ea16ff3fc2b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredProps.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ObjWithRequiredProps { // nest classes so all schemas and input/output classes can be public - public class A implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(A.class, arg, configuration); - } - } + public class A extends StringJsonSchema {} + public class ObjWithRequiredProps1 implements JsonSchema { /* @@ -59,7 +31,8 @@ public class ObjWithRequiredProps1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "a" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjWithRequiredProps1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredPropsBase.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredPropsBase.java index fc8735a86b4..78a1efc8162 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredPropsBase.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredPropsBase.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ObjWithRequiredPropsBase { // nest classes so all schemas and input/output classes can be public - public class B implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(B.class, arg, configuration); - } - } + public class B extends StringJsonSchema {} + public class ObjWithRequiredPropsBase1 implements JsonSchema { /* @@ -59,7 +31,8 @@ public class ObjWithRequiredPropsBase1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "b" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjWithRequiredPropsBase1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectInterface.java index 9ef23c81550..3a9fd6c5d53 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectInterface.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectInterface.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ObjectInterface { // nest classes so all schemas and input/output classes can be public - public class ObjectInterface1 extends MapJsonSchema { - } + public class ObjectInterface1 extends MapJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java index da0657f366a..1f708ef7f00 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java @@ -1,57 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ObjectModelWithArgAndArgsProperties { // nest classes so all schemas and input/output classes can be public - public class Arg implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Arg.class, arg, configuration); - } - } + public class Arg extends StringJsonSchema {} + + + public class Args extends StringJsonSchema {} - public class Args implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Args.class, arg, configuration); - } - } public class ObjectModelWithArgAndArgsProperties1 implements JsonSchema { /* @@ -70,7 +36,8 @@ public class ObjectModelWithArgAndArgsProperties1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "arg", "args" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectModelWithArgAndArgsProperties1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithRefProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithRefProps.java index 475c4b5ff46..af84b7940c5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithRefProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithRefProps.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ObjectModelWithRefProps { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java index 2354e93425c..cab27320471 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,19 +7,19 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ObjectWithAllOfWithReqTestPropFromUnsetAddProp { // nest classes so all schemas and input/output classes can be public - public class Name implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Name.class, arg, configuration); - } - } + public class Name extends StringJsonSchema {} + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -53,7 +30,8 @@ public class Schema1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "test" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } @@ -102,6 +80,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ObjectWithAllOfWithReqTestPropFromUnsetAddProp1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithAllOfWithReqTestPropFromUnsetAddProp1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithAllOfWithReqTestPropFromUnsetAddProp1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithCollidingProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithCollidingProperties.java index b33b64a303c..922c4df4091 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithCollidingProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithCollidingProperties.java @@ -1,46 +1,22 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.MapJsonSchema; public class ObjectWithCollidingProperties { // nest classes so all schemas and input/output classes can be public - public class SomeProp extends MapJsonSchema { - } + public class SomeProp extends MapJsonSchema {} - public class Someprop extends MapJsonSchema { - } + public class Someprop extends MapJsonSchema {} public class ObjectWithCollidingProperties1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDecimalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDecimalProperties.java index f3d94e8b6c3..9a93356bc88 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDecimalProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDecimalProperties.java @@ -1,49 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.DecimalJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ObjectWithDecimalProperties { // nest classes so all schemas and input/output classes can be public - public class Width implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "number"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Width.class, arg, configuration); - } - } + public class Width extends DecimalJsonSchema {} + public class ObjectWithDecimalProperties1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDifficultlyNamedProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDifficultlyNamedProps.java index 4863b31f3ea..96e5065218b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDifficultlyNamedProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDifficultlyNamedProps.java @@ -1,55 +1,27 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ObjectWithDifficultlyNamedProps { // nest classes so all schemas and input/output classes can be public - public class Specialpropertyname extends Int64JsonSchema { - } + public class Specialpropertyname extends Int64JsonSchema {} - public class Schema123list implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema123list.class, arg, configuration); - } - } + public class Schema123list extends StringJsonSchema {} - public class Schema123Number extends IntJsonSchema { - } + + public class Schema123Number extends IntJsonSchema {} public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { @@ -71,7 +43,8 @@ public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "123-list" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithDifficultlyNamedProps1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInlineCompositionProperty.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInlineCompositionProperty.java index 2f0c12929c1..836e38a2a6b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInlineCompositionProperty.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInlineCompositionProperty.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ObjectWithInlineCompositionProperty { // nest classes so all schemas and input/output classes can be public @@ -81,6 +63,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(SomeProp.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(SomeProp.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInvalidNamedRefedProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInvalidNamedRefedProperties.java index 0ef4b154f96..a13163684f6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInvalidNamedRefedProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInvalidNamedRefedProperties.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ObjectWithInvalidNamedRefedProperties { // nest classes so all schemas and input/output classes can be public @@ -52,7 +29,8 @@ public class ObjectWithInvalidNamedRefedProperties1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "!reference", "from" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithInvalidNamedRefedProperties1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithNonIntersectingValues.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithNonIntersectingValues.java index 861803f1748..b1570b23182 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithNonIntersectingValues.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithNonIntersectingValues.java @@ -1,51 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NumberJsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ObjectWithNonIntersectingValues { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalProperties.class, arg, configuration); - } - } + public class AdditionalProperties extends StringJsonSchema {} - public class A extends DoubleJsonSchema { - } + + public class A extends NumberJsonSchema {} public class ObjectWithNonIntersectingValues1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOnlyOptionalProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOnlyOptionalProps.java index 4e228e7de4f..40c4a10a69f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOnlyOptionalProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOnlyOptionalProps.java @@ -1,56 +1,29 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ObjectWithOnlyOptionalProps { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class A implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(A.class, arg, configuration); - } - } + public class A extends StringJsonSchema {} - public class B extends DoubleJsonSchema { - } + + public class B extends NumberJsonSchema {} public class ObjectWithOnlyOptionalProps1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOptionalTestProp.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOptionalTestProp.java index 2427860a34f..d032568e2dc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOptionalTestProp.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOptionalTestProp.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ObjectWithOptionalTestProp { // nest classes so all schemas and input/output classes can be public - public class Test implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Test.class, arg, configuration); - } - } + public class Test extends StringJsonSchema {} + public class ObjectWithOptionalTestProp1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithValidations.java index fe99a0de8b5..8669c0c4799 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithValidations.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithValidations.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ObjectWithValidations { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Order.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Order.java index dd3e88bae6c..41ca6803481 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Order.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Order.java @@ -1,61 +1,32 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Order { // nest classes so all schemas and input/output classes can be public - public class Id extends Int64JsonSchema { - } + public class Id extends Int64JsonSchema {} - public class PetId extends Int64JsonSchema { - } + public class PetId extends Int64JsonSchema {} - public class Quantity extends Int32JsonSchema { - } + public class Quantity extends Int32JsonSchema {} - public class ShipDate implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date-time"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ShipDate.class, arg, configuration); - } - } + public class ShipDate extends DateTimeJsonSchema {} + public class Status implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -66,8 +37,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Complete extends BooleanJsonSchema { - } + public class Complete extends BooleanJsonSchema {} public class Order1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PaginatedResultMyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PaginatedResultMyObjectDto.java index c433c39899b..6707fa00ae7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PaginatedResultMyObjectDto.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PaginatedResultMyObjectDto.java @@ -1,47 +1,27 @@ package org.openapijsonschematools.components.schemas; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class PaginatedResultMyObjectDto { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } - public class Count extends IntJsonSchema { - } + public class Count extends IntJsonSchema {} public class Results implements JsonSchema { @@ -71,7 +51,8 @@ public class PaginatedResultMyObjectDto1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "count", "results" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PaginatedResultMyObjectDto1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ParentPet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ParentPet.java index 07a7ac6beb4..b345bf33bc0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ParentPet.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ParentPet.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ParentPet { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pet.java index 15a31fb9643..fc99725ce02 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pet.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pet.java @@ -1,61 +1,29 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int64JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Pet { // nest classes so all schemas and input/output classes can be public - public class Id extends Int64JsonSchema { - } + public class Id extends Int64JsonSchema {} - public class Name implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Name.class, arg, configuration); - } - } + public class Name extends StringJsonSchema {} + + + public class Items extends StringJsonSchema {} - public class Items implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items.class, arg, configuration); - } - } public class PhotoUrls implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -109,7 +77,8 @@ public class Pet1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "name", "photoUrls" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Pet1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pig.java index d0758a3cb4b..039a94e9abc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pig.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pig.java @@ -1,35 +1,13 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Pig { // nest classes so all schemas and input/output classes can be public @@ -78,6 +56,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Pig1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Pig1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Pig1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java index fe283531768..3830a6aee00 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Player { // nest classes so all schemas and input/output classes can be public - public class Name implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Name.class, arg, configuration); - } - } + public class Name extends StringJsonSchema {} + public class Player1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PublicKey.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PublicKey.java index 84cea6605fd..45aad4b518b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PublicKey.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PublicKey.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class PublicKey { // nest classes so all schemas and input/output classes can be public - public class Key implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Key.class, arg, configuration); - } - } + public class Key extends StringJsonSchema {} + public class PublicKey1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Quadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Quadrilateral.java index 33fc5123df0..e33a60b2e7c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Quadrilateral.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Quadrilateral.java @@ -1,35 +1,13 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Quadrilateral { // nest classes so all schemas and input/output classes can be public @@ -78,6 +56,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Quadrilateral1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Quadrilateral1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Quadrilateral1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/QuadrilateralInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/QuadrilateralInterface.java index d6700c52249..b8b2a1de0fc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/QuadrilateralInterface.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/QuadrilateralInterface.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,12 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class QuadrilateralInterface { // nest classes so all schemas and input/output classes can be public @@ -44,14 +27,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class QuadrilateralType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(QuadrilateralType.class, arg, configuration); - } - } + public class QuadrilateralType extends StringJsonSchema {} + public class QuadrilateralInterface1 implements JsonSchema { /* @@ -67,7 +44,8 @@ public class QuadrilateralInterface1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "quadrilateralType", "shapeType" - )); public static Void validate(Void arg, SchemaConfiguration configuration) { + )); + public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(QuadrilateralInterface1.class, arg, configuration); } @@ -103,6 +81,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(QuadrilateralInterface1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(QuadrilateralInterface1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QuadrilateralInterface1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReadOnlyFirst.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReadOnlyFirst.java index 3a2ee2a757a..050f1e685bb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReadOnlyFirst.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReadOnlyFirst.java @@ -1,57 +1,23 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class ReadOnlyFirst { // nest classes so all schemas and input/output classes can be public - public class Bar implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Bar.class, arg, configuration); - } - } + public class Bar extends StringJsonSchema {} + + + public class Baz extends StringJsonSchema {} - public class Baz implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Baz.class, arg, configuration); - } - } public class ReadOnlyFirst1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/RefPet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/RefPet.java index 0ffbee523d8..5bfa2958b94 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/RefPet.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/RefPet.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class RefPet extends Pet { // $refed class - public class RefPet1 extends Pet1 { - } + public class RefPet1 extends Pet1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromExplicitAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromExplicitAddProps.java index 92321931a78..8dad7033375 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromExplicitAddProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromExplicitAddProps.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ReqPropsFromExplicitAddProps { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalProperties.class, arg, configuration); - } - } + public class AdditionalProperties extends StringJsonSchema {} + public class ReqPropsFromExplicitAddProps1 implements JsonSchema { /* @@ -57,7 +27,8 @@ public class ReqPropsFromExplicitAddProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "invalid-name", "validName" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ReqPropsFromExplicitAddProps1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromTrueAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromTrueAddProps.java index 1f376608f92..921c82a5be6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromTrueAddProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromTrueAddProps.java @@ -1,42 +1,17 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ReqPropsFromTrueAddProps { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties extends AnyTypeJsonSchema { - } + public class AdditionalProperties extends AnyTypeJsonSchema {} public class ReqPropsFromTrueAddProps1 implements JsonSchema { @@ -52,7 +27,8 @@ public class ReqPropsFromTrueAddProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "invalid-name", "validName" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ReqPropsFromTrueAddProps1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromUnsetAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromUnsetAddProps.java index 4e6d9d69628..42c0aa53154 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromUnsetAddProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromUnsetAddProps.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ReqPropsFromUnsetAddProps { // nest classes so all schemas and input/output classes can be public @@ -48,7 +23,8 @@ public class ReqPropsFromUnsetAddProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "invalid-name", "validName" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ReqPropsFromUnsetAddProps1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReturnSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReturnSchema.java index c1a73b87a0b..a0912189294 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReturnSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReturnSchema.java @@ -1,42 +1,22 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int32JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; public class ReturnSchema { // nest classes so all schemas and input/output classes can be public - public class ReturnSchema2 extends Int32JsonSchema { - } + public class ReturnSchema2 extends Int32JsonSchema {} public class ReturnSchema1 implements JsonSchema { @@ -87,6 +67,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ReturnSchema1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ReturnSchema1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ReturnSchema1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java index f9ff450edbf..0987d7604b5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class ScaleneTriangle { // nest classes so all schemas and input/output classes can be public @@ -100,6 +82,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ScaleneTriangle1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ScaleneTriangle1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ScaleneTriangle1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Schema200Response.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Schema200Response.java index 82f6d4883a5..df2247d1728 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Schema200Response.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Schema200Response.java @@ -1,52 +1,27 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int32JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema200Response { // nest classes so all schemas and input/output classes can be public - public class Name extends Int32JsonSchema { - } + public class Name extends Int32JsonSchema {} - public class ClassSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ClassSchema.class, arg, configuration); - } - } + public class ClassSchema extends StringJsonSchema {} + public class Schema200Response1 implements JsonSchema { /* @@ -97,6 +72,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Schema200Response1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Schema200Response1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema200Response1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingArrayModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingArrayModel.java index cba2a67c310..cc9dd17d366 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingArrayModel.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingArrayModel.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class SelfReferencingArrayModel { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingObjectModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingObjectModel.java index 8938532145b..f5804ec4d08 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingObjectModel.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingObjectModel.java @@ -1,35 +1,12 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class SelfReferencingObjectModel { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Shape.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Shape.java index 8b226c4b292..34e83f1cf44 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Shape.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Shape.java @@ -1,35 +1,13 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Shape { // nest classes so all schemas and input/output classes can be public @@ -78,6 +56,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Shape1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Shape1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Shape1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ShapeOrNull.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ShapeOrNull.java index f54b9bbd851..200266b0d19 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ShapeOrNull.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ShapeOrNull.java @@ -1,48 +1,21 @@ package org.openapijsonschematools.components.schemas; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class ShapeOrNull { // nest classes so all schemas and input/output classes can be public - public class Schema0 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema0.class, arg, configuration); - } - } + public class Schema0 extends NullJsonSchema {} + public class ShapeOrNull1 implements JsonSchema { /* @@ -89,6 +62,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(ShapeOrNull1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ShapeOrNull1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ShapeOrNull1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SimpleQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SimpleQuadrilateral.java index 3ec46cc5d74..c1fbcbe4ece 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SimpleQuadrilateral.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SimpleQuadrilateral.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class SimpleQuadrilateral { // nest classes so all schemas and input/output classes can be public @@ -100,6 +82,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(SimpleQuadrilateral1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(SimpleQuadrilateral1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SimpleQuadrilateral1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SomeObject.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SomeObject.java index 76fa572a883..e5e69d36281 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SomeObject.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SomeObject.java @@ -1,35 +1,13 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class SomeObject { // nest classes so all schemas and input/output classes can be public @@ -78,6 +56,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(SomeObject1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(SomeObject1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeObject1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SpecialModelname.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SpecialModelname.java index 3ace391966a..f9aa67839c7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SpecialModelname.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SpecialModelname.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class SpecialModelname { // nest classes so all schemas and input/output classes can be public - public class A implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(A.class, arg, configuration); - } - } + public class A extends StringJsonSchema {} + public class SpecialModelname1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringBooleanMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringBooleanMap.java index 7b43f02c929..982962912ad 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringBooleanMap.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringBooleanMap.java @@ -1,42 +1,17 @@ package org.openapijsonschematools.components.schemas; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class StringBooleanMap { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties extends BooleanJsonSchema { - } + public class AdditionalProperties extends BooleanJsonSchema {} public class StringBooleanMap1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnum.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnum.java index d9313586b67..7328048fa9a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnum.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnum.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class StringEnum { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnumWithDefaultValue.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnumWithDefaultValue.java index b704c61f735..bd0b7a35eb9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnumWithDefaultValue.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnumWithDefaultValue.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class StringEnumWithDefaultValue { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringSchema.java index 7fb19a315ee..90e28c12f83 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringSchema.java @@ -1,51 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class StringSchema { // nest classes so all schemas and input/output classes can be public - public class StringSchema1 implements JsonSchema { - /* - 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. - */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(StringSchema1.class, arg, configuration); - } - }} + public class StringSchema1 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringWithValidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringWithValidation.java index f1db6a81002..e0b248ae616 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringWithValidation.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringWithValidation.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class StringWithValidation { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Tag.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Tag.java index c15eafd4cb3..5afa078ae5b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Tag.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Tag.java @@ -1,52 +1,24 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int64JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Tag { // nest classes so all schemas and input/output classes can be public - public class Id extends Int64JsonSchema { - } + public class Id extends Int64JsonSchema {} - public class Name implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Name.class, arg, configuration); - } - } + public class Name extends StringJsonSchema {} + public class Tag1 implements JsonSchema { /* diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Triangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Triangle.java index 133d7134018..422bddd16bd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Triangle.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Triangle.java @@ -1,35 +1,13 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Triangle { // nest classes so all schemas and input/output classes can be public @@ -78,6 +56,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Triangle1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Triangle1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Triangle1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/TriangleInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/TriangleInterface.java index 72f449d3c05..d082ed84d95 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/TriangleInterface.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/TriangleInterface.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,12 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class TriangleInterface { // nest classes so all schemas and input/output classes can be public @@ -44,14 +27,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class TriangleType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(TriangleType.class, arg, configuration); - } - } + public class TriangleType extends StringJsonSchema {} + public class TriangleInterface1 implements JsonSchema { /* @@ -67,7 +44,8 @@ public class TriangleInterface1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "shapeType", "triangleType" - )); public static Void validate(Void arg, SchemaConfiguration configuration) { + )); + public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(TriangleInterface1.class, arg, configuration); } @@ -103,6 +81,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(TriangleInterface1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(TriangleInterface1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(TriangleInterface1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/UUIDString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/UUIDString.java index 2e326294cf6..23525d05155 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/UUIDString.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/UUIDString.java @@ -1,35 +1,9 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class UUIDString { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/User.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/User.java index 5bdbee50ae0..6bb8d313698 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/User.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/User.java @@ -1,104 +1,53 @@ package org.openapijsonschematools.components.schemas; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class User { // nest classes so all schemas and input/output classes can be public - public class Id extends Int64JsonSchema { - } + public class Id extends Int64JsonSchema {} - public class Username implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Username.class, arg, configuration); - } - } + public class Username extends StringJsonSchema {} - public class FirstName implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(FirstName.class, arg, configuration); - } - } - public class LastName implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(LastName.class, arg, configuration); - } - } + public class FirstName extends StringJsonSchema {} - public class Email implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Email.class, arg, configuration); - } - } - public class Password implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Password.class, arg, configuration); - } - } + public class LastName extends StringJsonSchema {} - public class Phone implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Phone.class, arg, configuration); - } - } - public class UserStatus extends Int32JsonSchema { - } + public class Email extends StringJsonSchema {} - public class ObjectWithNoDeclaredProps extends MapJsonSchema { - } + public class Password extends StringJsonSchema {} + + + public class Phone extends StringJsonSchema {} + + + public class UserStatus extends Int32JsonSchema {} + + + public class ObjectWithNoDeclaredProps extends MapJsonSchema {} public class ObjectWithNoDeclaredPropsNullable implements JsonSchema { @@ -114,60 +63,11 @@ public static T validate(Map arg, SchemaCo } } - public class AnyTypeProp implements JsonSchema { - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static Integer validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static Float validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static Double validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static T validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - - public static U validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeProp.class, arg, configuration); - } - } + public class AnyTypeProp extends AnyTypeJsonSchema {} + + + public class Not extends NullJsonSchema {} - public class Not implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Not.class, arg, configuration); - } - } public class AnyTypeExceptNullProp implements JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { @@ -206,61 +106,22 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(AnyTypeExceptNullProp.class, arg, configuration); } - public static T validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeExceptNullProp.class, arg, configuration); - } - - public static U validate(List arg, SchemaConfiguration configuration) { + public static String validate(UUID arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeExceptNullProp.class, arg, configuration); } - } - - public class AnyTypePropNullable implements JsonSchema { - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static Integer validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static Float validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static Double validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } - - public static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); - } public static T validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); + return JsonSchema.validate(AnyTypeExceptNullProp.class, arg, configuration); } public static U validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypePropNullable.class, arg, configuration); + return JsonSchema.validate(AnyTypeExceptNullProp.class, arg, configuration); } } + public class AnyTypePropNullable extends AnyTypeJsonSchema {} + + public class User1 implements JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Whale.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Whale.java index 711350dec84..a24d2481a7c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Whale.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Whale.java @@ -1,46 +1,22 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.BooleanJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Whale { // nest classes so all schemas and input/output classes can be public - public class HasBaleen extends BooleanJsonSchema { - } + public class HasBaleen extends BooleanJsonSchema {} - public class HasTeeth extends BooleanJsonSchema { - } + public class HasTeeth extends BooleanJsonSchema {} public class ClassName implements JsonSchema { @@ -69,7 +45,8 @@ public class Whale1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "className" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Whale1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Zebra.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Zebra.java index 136ac5965b6..04bac616609 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Zebra.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Zebra.java @@ -1,42 +1,19 @@ package org.openapijsonschematools.components.schemas; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Zebra { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties extends AnyTypeJsonSchema { - } + public class AdditionalProperties extends AnyTypeJsonSchema {} public class Type implements JsonSchema { @@ -73,7 +50,8 @@ public class Zebra1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "className" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Zebra1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/anotherfakedummy/patch/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/anotherfakedummy/patch/responses/response200/content/applicationjson/Schema.java index 21cfcc77b6d..87f26b7c683 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/anotherfakedummy/patch/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/anotherfakedummy/patch/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.anotherfakedummy.patch.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Client; public class Schema extends Client { // $refed class - public class Schema1 extends Client1 { - } + public class Schema1 extends Client1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java index 9f829671651..0de422a5941 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.commonparamsubdir.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.commonparamsubdir.delete.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class HeaderParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class HeaderParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java index 901f2e39d54..a3bb2161aee 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.commonparamsubdir.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.commonparamsubdir.delete.parameters.parameter1.Schema1; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "subDir" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter0/Schema0.java index f569e925294..a7779b81e6b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.commonparamsubdir.delete.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter1/Schema1.java index a28e0bcc4a1..83cb4ac7ac1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter1/Schema1.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.commonparamsubdir.delete.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema1 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/PathParameters.java index 98a46b6354f..bcb146e36f7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.commonparamsubdir.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.commonparamsubdir.parameters.parameter0.PathParamSchema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "subDir" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/QueryParameters.java index 51cbd1349ad..e2a1c6e7fa1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/QueryParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.commonparamsubdir.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.commonparamsubdir.get.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/parameters/parameter0/Schema0.java index 3ed8bf3ad75..0cd27e5d4e5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.commonparamsubdir.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/parameters/parameter0/PathParamSchema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/parameters/parameter0/PathParamSchema0.java index a6584e3cca7..216ddd2a8d2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/parameters/parameter0/PathParamSchema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/parameters/parameter0/PathParamSchema0.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.commonparamsubdir.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class PathParamSchema0 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/HeaderParameters.java index 0efe8b0ca84..39a2db11ccb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/HeaderParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.commonparamsubdir.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.commonparamsubdir.post.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class HeaderParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class HeaderParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/PathParameters.java index f86538a1258..a3d81459bc7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.commonparamsubdir.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.commonparamsubdir.parameters.parameter0.PathParamSchema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "subDir" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/parameters/parameter0/Schema0.java index 5c285a8d91c..c084f3bd0d1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.commonparamsubdir.post.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/HeaderParameters.java index 24e231006fa..c617df271e0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/HeaderParameters.java @@ -1,45 +1,23 @@ package org.openapijsonschematools.paths.fake.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fake.delete.parameters.parameter1.Schema1; import org.openapijsonschematools.paths.fake.delete.parameters.parameter4.Schema4; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class HeaderParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class HeaderParameters1 implements JsonSchema { @@ -52,7 +30,8 @@ public class HeaderParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "required_boolean_group" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(HeaderParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/QueryParameters.java index 4d0120fea59..d8a7caa18e0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/QueryParameters.java @@ -1,47 +1,25 @@ package org.openapijsonschematools.paths.fake.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fake.delete.parameters.parameter0.Schema0; import org.openapijsonschematools.paths.fake.delete.parameters.parameter2.Schema2; import org.openapijsonschematools.paths.fake.delete.parameters.parameter3.Schema3; import org.openapijsonschematools.paths.fake.delete.parameters.parameter5.Schema5; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -57,7 +35,8 @@ public class QueryParameters1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "required_int64_group", "required_string_group" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter0/Schema0.java index da5afc22876..56da126da61 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fake.delete.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter1/Schema1.java index a8d1d69c9f3..710e826fb92 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter1/Schema1.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.fake.delete.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema1 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter2/Schema2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter2/Schema2.java index d5fc5e822b2..d32c5f3714f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter2/Schema2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter2/Schema2.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fake.delete.parameters.parameter2; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema2 { // nest classes so all schemas and input/output classes can be public - public class Schema21 extends Int64JsonSchema { - } + public class Schema21 extends Int64JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter3/Schema3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter3/Schema3.java index aa327df1a94..336ea05212b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter3/Schema3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter3/Schema3.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fake.delete.parameters.parameter3; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema3 { // nest classes so all schemas and input/output classes can be public - public class Schema31 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema31.class, arg, configuration); - } - }} + public class Schema31 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter4/Schema4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter4/Schema4.java index f470d4864b4..0f111854b5f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter4/Schema4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter4/Schema4.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.fake.delete.parameters.parameter4; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema4 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter5/Schema5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter5/Schema5.java index bf48299310e..4e083aa5f4b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter5/Schema5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter5/Schema5.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fake.delete.parameters.parameter5; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema5 { // nest classes so all schemas and input/output classes can be public - public class Schema51 extends Int64JsonSchema { - } + public class Schema51 extends Int64JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/HeaderParameters.java index c0ba69e0dec..db4641974ec 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/HeaderParameters.java @@ -1,45 +1,23 @@ package org.openapijsonschematools.paths.fake.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fake.get.parameters.parameter0.Schema0; import org.openapijsonschematools.paths.fake.get.parameters.parameter1.Schema1; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class HeaderParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class HeaderParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/QueryParameters.java index 900a6d8c77d..1a4cfc7c570 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/QueryParameters.java @@ -1,47 +1,25 @@ package org.openapijsonschematools.paths.fake.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fake.get.parameters.parameter2.Schema2; import org.openapijsonschematools.paths.fake.get.parameters.parameter3.Schema3; import org.openapijsonschematools.paths.fake.get.parameters.parameter4.Schema4; import org.openapijsonschematools.paths.fake.get.parameters.parameter5.Schema5; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter0/Schema0.java index fe6f28ac97a..016fa5f9f8e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter0/Schema0.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.paths.fake.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema0 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter1/Schema1.java index 932a9304024..561205d1994 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter1/Schema1.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.fake.get.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema1 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter2/Schema2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter2/Schema2.java index c795be81f6f..5877e766c5e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter2/Schema2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter2/Schema2.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.paths.fake.get.parameters.parameter2; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema2 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter3/Schema3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter3/Schema3.java index 746d8b9c99a..659177d4211 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter3/Schema3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter3/Schema3.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.fake.get.parameters.parameter3; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema3 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter4/Schema4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter4/Schema4.java index 9e1acd36acd..1b0ada867db 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter4/Schema4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter4/Schema4.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.fake.get.parameters.parameter4; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema4 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter5/Schema5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter5/Schema5.java index 5e3bbe3e94a..f22f85161bd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter5/Schema5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter5/Schema5.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.fake.get.parameters.parameter5; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema5 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java index ff8b78f0b8e..fce142ca4c3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -1,35 +1,14 @@ package org.openapijsonschematools.paths.fake.get.requestbody.content.applicationxwwwformurlencoded; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/responses/response404/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/responses/response404/content/applicationjson/Schema.java index b38dbd8ef3a..661474aeb39 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/responses/response404/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/responses/response404/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fake.get.responses.response404.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends MapJsonSchema { - } + public class Schema1 extends MapJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/patch/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/patch/responses/response200/content/applicationjson/Schema.java index 81b8332e43e..c887d7f27a9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/patch/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/patch/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fake.patch.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Client; public class Schema extends Client { // $refed class - public class Schema1 extends Client1 { - } + public class Schema1 extends Client1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java index 7be8008f976..8b1e377e3f0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -1,35 +1,16 @@ package org.openapijsonschematools.paths.fake.post.requestbody.content.applicationxwwwformurlencoded; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.DateJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.Int64JsonSchema; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public @@ -84,8 +65,7 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } - public class Int64 extends Int64JsonSchema { - } + public class Int64 extends Int64JsonSchema {} public class NumberSchema implements JsonSchema { @@ -156,35 +136,16 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class ByteSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "byte"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ByteSchema.class, arg, configuration); - } - } + public class ByteSchema extends StringJsonSchema {} + public class Binary implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - } + // BinarySchema + } + + + public class Date extends DateJsonSchema {} - public class Date implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Date.class, arg, configuration); - } - } public class DateTime implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -206,14 +167,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Callback implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Callback.class, arg, configuration); - } - } + public class Callback extends StringJsonSchema {} + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -240,7 +195,8 @@ public class Schema1 implements JsonSchema { "double", "number", "pattern_without_delimiter" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/requestbody/content/applicationjson/Schema.java index ceed202fd70..ad1632bfd7d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakeadditionalpropertieswitharrayofenums.get.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.AdditionalPropertiesWithArrayOfEnums; public class Schema extends AdditionalPropertiesWithArrayOfEnums { // $refed class - public class Schema1 extends AdditionalPropertiesWithArrayOfEnums1 { - } + public class Schema1 extends AdditionalPropertiesWithArrayOfEnums1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/responses/response200/content/applicationjson/Schema.java index d4b8929d049..01cac60e5cc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeadditionalpropertieswitharrayofenums/get/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakeadditionalpropertieswitharrayofenums.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.AdditionalPropertiesWithArrayOfEnums; public class Schema extends AdditionalPropertiesWithArrayOfEnums { // $refed class - public class Schema1 extends AdditionalPropertiesWithArrayOfEnums1 { - } + public class Schema1 extends AdditionalPropertiesWithArrayOfEnums1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithfileschema/put/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithfileschema/put/requestbody/content/applicationjson/Schema.java index ef18b7077a0..6cb1fb4dec4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithfileschema/put/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithfileschema/put/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakebodywithfileschema.put.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.FileSchemaTestClass; public class Schema extends FileSchemaTestClass { // $refed class - public class Schema1 extends FileSchemaTestClass1 { - } + public class Schema1 extends FileSchemaTestClass1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/QueryParameters.java index ee7d5fb1579..6a5970cbaf1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/QueryParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.fakebodywithqueryparams.put; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakebodywithqueryparams.put.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class QueryParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "query" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/parameters/parameter0/Schema0.java index 8a896cb2ac7..af5003c4c83 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakebodywithqueryparams.put.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/requestbody/content/applicationjson/Schema.java index d77c0044c44..1dfe4f7b2ab 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakebodywithqueryparams.put.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.User; public class Schema extends User { // $refed class - public class Schema1 extends User1 { - } + public class Schema1 extends User1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/QueryParameters.java index 7d221216d6c..d42dd9f5e7c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/QueryParameters.java @@ -1,46 +1,24 @@ package org.openapijsonschematools.paths.fakecasesensitiveparams.put; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakecasesensitiveparams.put.parameters.parameter0.Schema0; import org.openapijsonschematools.paths.fakecasesensitiveparams.put.parameters.parameter1.Schema1; import org.openapijsonschematools.paths.fakecasesensitiveparams.put.parameters.parameter2.Schema2; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -56,7 +34,8 @@ public class QueryParameters1 implements JsonSchema { "SomeVar", "someVar", "some_var" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter0/Schema0.java index 3963ce755ce..4b0ea108672 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakecasesensitiveparams.put.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter1/Schema1.java index 2cb35c9488d..09b5980e068 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter1/Schema1.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakecasesensitiveparams.put.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema1 { // nest classes so all schemas and input/output classes can be public - public class Schema11 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema11.class, arg, configuration); - } - }} + public class Schema11 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter2/Schema2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter2/Schema2.java index 50846d7c9bd..ec9f19a7264 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter2/Schema2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/parameters/parameter2/Schema2.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakecasesensitiveparams.put.parameters.parameter2; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema2 { // nest classes so all schemas and input/output classes can be public - public class Schema21 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema21.class, arg, configuration); - } - }} + public class Schema21 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeclassnametest/patch/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeclassnametest/patch/responses/response200/content/applicationjson/Schema.java index 47143e5f25c..e4ea2bb40f2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeclassnametest/patch/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeclassnametest/patch/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakeclassnametest.patch.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Client; public class Schema extends Client { // $refed class - public class Schema1 extends Client1 { - } + public class Schema1 extends Client1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/PathParameters.java index 66a482417ff..636061a20ad 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.fakedeletecoffeeid.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakedeletecoffeeid.delete.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "id" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/parameters/parameter0/Schema0.java index a15ddbce6a1..b17daa39a59 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakedeletecoffeeid.delete.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakehealth/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakehealth/get/responses/response200/content/applicationjson/Schema.java index 2b76c3d6f4c..0e241f9d070 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakehealth/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakehealth/get/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakehealth.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.HealthCheckResult; public class Schema extends HealthCheckResult { // $refed class - public class Schema1 extends HealthCheckResult1 { - } + public class Schema1 extends HealthCheckResult1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java index 3a44c503a1b..bb5f11f518f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.paths.fakeinlineadditionalproperties.post.requestbody.content.applicationjson; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalProperties.class, arg, configuration); - } - } + public class AdditionalProperties extends StringJsonSchema {} + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/QueryParameters.java index 5aa72b6364b..2a37f013324 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/QueryParameters.java @@ -1,45 +1,23 @@ package org.openapijsonschematools.paths.fakeinlinecomposition.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakeinlinecomposition.post.parameters.parameter0.Schema0; import org.openapijsonschematools.paths.fakeinlinecomposition.post.parameters.parameter1.Schema1; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter0/Schema0.java index ad0868d8349..432843936ec 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter0/Schema0.java @@ -1,35 +1,15 @@ package org.openapijsonschematools.paths.fakeinlinecomposition.post.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema0 { // nest classes so all schemas and input/output classes can be public @@ -81,6 +61,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Schema01.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Schema01.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java index d9b7c0a712c..4b78f8e42be 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.paths.fakeinlinecomposition.post.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema1 { // nest classes so all schemas and input/output classes can be public @@ -81,6 +63,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(SomeProp1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(SomeProp1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/applicationjson/Schema.java index f8cf4b88156..6b30ba64013 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/applicationjson/Schema.java @@ -1,35 +1,15 @@ package org.openapijsonschematools.paths.fakeinlinecomposition.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public @@ -81,6 +61,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Schema1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Schema1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java index 252cdf25e05..3de93bbf15d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.paths.fakeinlinecomposition.post.requestbody.content.multipartformdata; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public @@ -81,6 +63,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(SomeProp.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(SomeProp.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/applicationjson/Schema.java index ce5f5c13e1a..1ce9290318a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/applicationjson/Schema.java @@ -1,35 +1,15 @@ package org.openapijsonschematools.paths.fakeinlinecomposition.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public @@ -81,6 +61,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(Schema1.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(Schema1.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java index e790fd0357b..c92f0a34232 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java @@ -1,27 +1,4 @@ package org.openapijsonschematools.paths.fakeinlinecomposition.post.responses.response200.content.multipartformdata; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; @@ -30,6 +7,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.UUID; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public @@ -81,6 +63,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(SomeProp.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(SomeProp.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java index d5e5911b2a8..064b715d892 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -1,57 +1,23 @@ package org.openapijsonschematools.paths.fakejsonformdata.get.requestbody.content.applicationxwwwformurlencoded; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Param implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Param.class, arg, configuration); - } - } + public class Param extends StringJsonSchema {} + + + public class Param2 extends StringJsonSchema {} - public class Param2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Param2.class, arg, configuration); - } - } public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -64,7 +30,8 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "param", "param2" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonpatch/patch/requestbody/content/applicationjsonpatchjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonpatch/patch/requestbody/content/applicationjsonpatchjson/Schema.java index f57d2867563..51326754a1d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonpatch/patch/requestbody/content/applicationjsonpatchjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonpatch/patch/requestbody/content/applicationjsonpatchjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakejsonpatch.patch.requestbody.content.applicationjsonpatchjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.JSONPatchRequest; public class Schema extends JSONPatchRequest { // $refed class - public class Schema1 extends JSONPatchRequest1 { - } + public class Schema1 extends JSONPatchRequest1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/requestbody/content/applicationjsoncharsetutf8/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/requestbody/content/applicationjsoncharsetutf8/Schema.java index fc9515970fb..e338c4cd759 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/requestbody/content/applicationjsoncharsetutf8/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/requestbody/content/applicationjsoncharsetutf8/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakejsonwithcharset.post.requestbody.content.applicationjsoncharsetutf8; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/responses/response200/content/applicationjsoncharsetutf8/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/responses/response200/content/applicationjsoncharsetutf8/Schema.java index 47ad9c29d96..369cd3f5d7a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/responses/response200/content/applicationjsoncharsetutf8/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakejsonwithcharset/post/responses/response200/content/applicationjsoncharsetutf8/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakejsonwithcharset.post.responses.response200.content.applicationjsoncharsetutf8; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java index fa2d76eb444..a561f7b5019 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.paths.fakemultiplerequestbodycontenttypes.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public - public class A implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(A.class, arg, configuration); - } - } + public class A extends StringJsonSchema {} + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java index 46ea21bb65b..d3e8be6eb24 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.paths.fakemultiplerequestbodycontenttypes.post.requestbody.content.multipartformdata; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public - public class B implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(B.class, arg, configuration); - } - } + public class B extends StringJsonSchema {} + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/responses/response200/content/applicationjson/Schema.java index 75420d01537..8f6199bf4b6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplerequestbodycontenttypes/post/responses/response200/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakemultiplerequestbodycontenttypes.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response200/content/applicationjson/Schema.java index 4e3c8b07865..b00956a3b7c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response200/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakemultipleresponsebodies.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response202/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response202/content/applicationjson/Schema.java index e68e17ee4b7..06c43f44ad6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response202/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultipleresponsebodies/get/responses/response202/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakemultipleresponsebodies.get.responses.response202.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplesecurities/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplesecurities/get/responses/response200/content/applicationjson/Schema.java index fac47b5893b..4fc1e6cc6c7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplesecurities/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakemultiplesecurities/get/responses/response200/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakemultiplesecurities.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/QueryParameters.java index 4cfd806d54c..ead2819509e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/QueryParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.fakeobjinquery.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakeobjinquery.get.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java index 6209ac2fb9b..3b1d220b1eb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java @@ -1,48 +1,20 @@ package org.openapijsonschematools.paths.fakeobjinquery.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Keyword0 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Keyword0.class, arg, configuration); - } - } + public class Keyword0 extends StringJsonSchema {} + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java index cfb53618e46..f4ecf2a03ab 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java @@ -1,48 +1,26 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter14.Schema14; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter15.Schema15; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter16.Schema16; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter17.Schema17; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter18.Schema18; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class CookieParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class CookieParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java index dd4adf3abbc..f809d0b1725 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java @@ -1,47 +1,25 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter5.Schema5; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter6.Schema6; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter7.Schema7; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter8.Schema8; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class HeaderParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class HeaderParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/PathParameters.java index 38904ada548..e6885b3eb79 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/PathParameters.java @@ -1,48 +1,26 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter10.Schema10; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter11.Schema11; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter12.Schema12; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter13.Schema13; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter9.Schema9; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -62,7 +40,8 @@ public class PathParameters1 implements JsonSchema { "Ab", "aB", "self" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java index c004da8a1c2..1c106105153 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java @@ -1,48 +1,26 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter0.Schema0; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter1.Schema1; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter2.Schema2; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter3.Schema3; import org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter4.Schema4; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0/Schema0.java index f5ea9dcd34f..0bc02037b01 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1/Schema1.java index 6930acb0b79..0ce13a7bf95 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter1/Schema1.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema1 { // nest classes so all schemas and input/output classes can be public - public class Schema11 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema11.class, arg, configuration); - } - }} + public class Schema11 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10/Schema10.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10/Schema10.java index 3df44a754be..a1483b708cb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10/Schema10.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter10/Schema10.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter10; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema10 { // nest classes so all schemas and input/output classes can be public - public class Schema101 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema101.class, arg, configuration); - } - }} + public class Schema101 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11/Schema11.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11/Schema11.java index 1a02a77ffba..511b2bf9c8f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11/Schema11.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter11/Schema11.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter11; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema11 { // nest classes so all schemas and input/output classes can be public - public class Schema111 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema111.class, arg, configuration); - } - }} + public class Schema111 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12/Schema12.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12/Schema12.java index 8a20d062e12..90c7ca00506 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12/Schema12.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter12/Schema12.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter12; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema12 { // nest classes so all schemas and input/output classes can be public - public class Schema121 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema121.class, arg, configuration); - } - }} + public class Schema121 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13/Schema13.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13/Schema13.java index 1d0626098cb..7ef63ac2560 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13/Schema13.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter13/Schema13.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter13; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema13 { // nest classes so all schemas and input/output classes can be public - public class Schema131 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema131.class, arg, configuration); - } - }} + public class Schema131 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14/Schema14.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14/Schema14.java index efc3556afd3..8ddce66c03e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14/Schema14.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter14/Schema14.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter14; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema14 { // nest classes so all schemas and input/output classes can be public - public class Schema141 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema141.class, arg, configuration); - } - }} + public class Schema141 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15/Schema15.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15/Schema15.java index 8f409690688..2d2fa3ba46a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15/Schema15.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter15/Schema15.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter15; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema15 { // nest classes so all schemas and input/output classes can be public - public class Schema151 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema151.class, arg, configuration); - } - }} + public class Schema151 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16/Schema16.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16/Schema16.java index 535ea929443..91a6f5cddf1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16/Schema16.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter16/Schema16.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter16; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema16 { // nest classes so all schemas and input/output classes can be public - public class Schema161 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema161.class, arg, configuration); - } - }} + public class Schema161 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17/Schema17.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17/Schema17.java index 0604f7285c9..f66d1b63dde 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17/Schema17.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter17/Schema17.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter17; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema17 { // nest classes so all schemas and input/output classes can be public - public class Schema171 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema171.class, arg, configuration); - } - }} + public class Schema171 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18/Schema18.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18/Schema18.java index a4cb671efe2..5bd2051e802 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18/Schema18.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter18/Schema18.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter18; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema18 { // nest classes so all schemas and input/output classes can be public - public class Schema181 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema181.class, arg, configuration); - } - }} + public class Schema181 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2/Schema2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2/Schema2.java index 1d53f3443fa..570c8fd0d37 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2/Schema2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter2/Schema2.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter2; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema2 { // nest classes so all schemas and input/output classes can be public - public class Schema21 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema21.class, arg, configuration); - } - }} + public class Schema21 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3/Schema3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3/Schema3.java index 02a4d4a2567..2b710278d3e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3/Schema3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter3/Schema3.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter3; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema3 { // nest classes so all schemas and input/output classes can be public - public class Schema31 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema31.class, arg, configuration); - } - }} + public class Schema31 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4/Schema4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4/Schema4.java index 6bec4114843..467e96508f0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4/Schema4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter4/Schema4.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter4; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema4 { // nest classes so all schemas and input/output classes can be public - public class Schema41 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema41.class, arg, configuration); - } - }} + public class Schema41 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5/Schema5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5/Schema5.java index 3466814bdfa..943c6fb46f6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5/Schema5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter5/Schema5.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter5; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema5 { // nest classes so all schemas and input/output classes can be public - public class Schema51 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema51.class, arg, configuration); - } - }} + public class Schema51 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6/Schema6.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6/Schema6.java index 4eaec6dc458..59b41c4346b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6/Schema6.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter6/Schema6.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter6; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema6 { // nest classes so all schemas and input/output classes can be public - public class Schema61 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema61.class, arg, configuration); - } - }} + public class Schema61 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7/Schema7.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7/Schema7.java index a81891606de..ad821edb720 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7/Schema7.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter7/Schema7.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter7; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema7 { // nest classes so all schemas and input/output classes can be public - public class Schema71 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema71.class, arg, configuration); - } - }} + public class Schema71 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8/Schema8.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8/Schema8.java index db10e30eacc..c548bd7a066 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8/Schema8.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter8/Schema8.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter8; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema8 { // nest classes so all schemas and input/output classes can be public - public class Schema81 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema81.class, arg, configuration); - } - }} + public class Schema81 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9/Schema9.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9/Schema9.java index bcc79d6f955..b52effbf749 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9/Schema9.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/parameters/parameter9/Schema9.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.parameters.parameter9; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema9 { // nest classes so all schemas and input/output classes can be public - public class Schema91 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema91.class, arg, configuration); - } - }} + public class Schema91 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/requestbody/content/applicationjson/Schema.java index 9268f677bbf..fb56caad715 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/requestbody/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/responses/response200/content/applicationjson/Schema.java index 08c8586b995..7489caa63d7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/responses/response200/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakeparametercollisions1ababselfab.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java index d991760a716..cc94f8727ed 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.fakepetiduploadimagewithrequiredfile.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakepetiduploadimagewithrequiredfile.post.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "petId" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schema0.java index 39a856d8d9e..8432c4432ef 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schema0.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakepetiduploadimagewithrequiredfile.post.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 extends Int64JsonSchema { - } + public class Schema01 extends Int64JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java index 72fb453929d..45a3b1e1b82 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java @@ -1,58 +1,25 @@ package org.openapijsonschematools.paths.fakepetiduploadimagewithrequiredfile.post.requestbody.content.multipartformdata; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public - public class AdditionalMetadata implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalMetadata.class, arg, configuration); - } - } + public class AdditionalMetadata extends StringJsonSchema {} + public class RequiredFile implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - } + // BinarySchema + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -64,7 +31,8 @@ public class Schema1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "requiredFile" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/responses/response200/content/applicationjson/Schema.java index 3c212f756e0..e59ded137b5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakepetiduploadimagewithrequiredfile.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ApiResponseSchema; public class Schema extends ApiResponseSchema { // $refed class - public class Schema1 extends ApiResponseSchema1 { - } + public class Schema1 extends ApiResponseSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java index 6c7d2ba9e9d..6f1a212309d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.fakequeryparamwithjsoncontenttype.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.fakequeryparamwithjsoncontenttype.get.parameters.parameter0.content.applicationjson.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class QueryParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "someParam" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0/content/applicationjson/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0/content/applicationjson/Schema0.java index c1e8c8ea5cd..26509a30a84 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0/content/applicationjson/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0/content/applicationjson/Schema0.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakequeryparamwithjsoncontenttype.get.parameters.parameter0.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 extends AnyTypeJsonSchema { - } + public class Schema01 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/responses/response200/content/applicationjson/Schema.java index 8b9e6a0f498..617ac71dd4e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/responses/response200/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakequeryparamwithjsoncontenttype.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/QueryParameters.java index 2d695fae70d..1bdd3fcc021 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/QueryParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.fakerefobjinquery.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.schemas.Foo; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/parameters/parameter0/Schema0.java index 56753e20870..a4571209d8d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/parameters/parameter0/Schema0.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefobjinquery.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Foo; public class Schema0 extends Foo { // $refed class - public class Schema01 extends Foo1 { - } + public class Schema01 extends Foo1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/requestbody/content/applicationjson/Schema.java index 457c97041c3..2ad4f4bec5c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsarraymodel.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.AnimalFarm; public class Schema extends AnimalFarm { // $refed class - public class Schema1 extends AnimalFarm1 { - } + public class Schema1 extends AnimalFarm1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/responses/response200/content/applicationjson/Schema.java index c0a56b5fdfd..5c844d9aa8f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarraymodel/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsarraymodel.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.AnimalFarm; public class Schema extends AnimalFarm { // $refed class - public class Schema1 extends AnimalFarm1 { - } + public class Schema1 extends AnimalFarm1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/requestbody/content/applicationjson/Schema.java index f0f96404fda..38947a3079f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsarrayofenums.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ArrayOfEnums; public class Schema extends ArrayOfEnums { // $refed class - public class Schema1 extends ArrayOfEnums1 { - } + public class Schema1 extends ArrayOfEnums1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/responses/response200/content/applicationjson/Schema.java index 99c44789072..7d8d9ba35d2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsarrayofenums/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsarrayofenums.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ArrayOfEnums; public class Schema extends ArrayOfEnums { // $refed class - public class Schema1 extends ArrayOfEnums1 { - } + public class Schema1 extends ArrayOfEnums1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/requestbody/content/applicationjson/Schema.java index d344c5d0752..c96e0d1ce90 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsboolean.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.BooleanSchema; public class Schema extends BooleanSchema { // $refed class - public class Schema1 extends BooleanSchema1 { - } + public class Schema1 extends BooleanSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/responses/response200/content/applicationjson/Schema.java index 0d0a9447698..c324dc24ab5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsboolean/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsboolean.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.BooleanSchema; public class Schema extends BooleanSchema { // $refed class - public class Schema1 extends BooleanSchema1 { - } + public class Schema1 extends BooleanSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/requestbody/content/applicationjson/Schema.java index abc0458016c..96bd101313f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefscomposedoneofnumberwithvalidations.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ComposedOneOfDifferentTypes; public class Schema extends ComposedOneOfDifferentTypes { // $refed class - public class Schema1 extends ComposedOneOfDifferentTypes1 { - } + public class Schema1 extends ComposedOneOfDifferentTypes1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/responses/response200/content/applicationjson/Schema.java index e767b4f5846..7a9d6af1a70 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefscomposedoneofnumberwithvalidations/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefscomposedoneofnumberwithvalidations.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ComposedOneOfDifferentTypes; public class Schema extends ComposedOneOfDifferentTypes { // $refed class - public class Schema1 extends ComposedOneOfDifferentTypes1 { - } + public class Schema1 extends ComposedOneOfDifferentTypes1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/requestbody/content/applicationjson/Schema.java index 4a5eaa08381..f5e92f796f1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsenum.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringEnum; public class Schema extends StringEnum { // $refed class - public class Schema1 extends StringEnum1 { - } + public class Schema1 extends StringEnum1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/responses/response200/content/applicationjson/Schema.java index b9f0b4e7d02..0e399ad0ded 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsenum/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsenum.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringEnum; public class Schema extends StringEnum { // $refed class - public class Schema1 extends StringEnum1 { - } + public class Schema1 extends StringEnum1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/requestbody/content/applicationjson/Schema.java index 6c61057acd6..20bc49ad0cf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsmammal.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Mammal; public class Schema extends Mammal { // $refed class - public class Schema1 extends Mammal1 { - } + public class Schema1 extends Mammal1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/responses/response200/content/applicationjson/Schema.java index 5bab6e7f974..fa514091e63 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsmammal/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsmammal.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Mammal; public class Schema extends Mammal { // $refed class - public class Schema1 extends Mammal1 { - } + public class Schema1 extends Mammal1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/requestbody/content/applicationjson/Schema.java index cf0ac890bea..0fefda58386 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsnumber.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.NumberWithValidations; public class Schema extends NumberWithValidations { // $refed class - public class Schema1 extends NumberWithValidations1 { - } + public class Schema1 extends NumberWithValidations1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/responses/response200/content/applicationjson/Schema.java index 9f02fd950d8..34fa9f1bf2d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsnumber/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsnumber.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.NumberWithValidations; public class Schema extends NumberWithValidations { // $refed class - public class Schema1 extends NumberWithValidations1 { - } + public class Schema1 extends NumberWithValidations1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/requestbody/content/applicationjson/Schema.java index a94987cdc1a..6d64a0fb4ea 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsobjectmodelwithrefprops.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ObjectModelWithRefProps; public class Schema extends ObjectModelWithRefProps { // $refed class - public class Schema1 extends ObjectModelWithRefProps1 { - } + public class Schema1 extends ObjectModelWithRefProps1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/responses/response200/content/applicationjson/Schema.java index e95e043578d..0e7d46fa037 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsobjectmodelwithrefprops/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsobjectmodelwithrefprops.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ObjectModelWithRefProps; public class Schema extends ObjectModelWithRefProps { // $refed class - public class Schema1 extends ObjectModelWithRefProps1 { - } + public class Schema1 extends ObjectModelWithRefProps1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/requestbody/content/applicationjson/Schema.java index 42b51d9f96e..fd9412c1889 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsstring.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringSchema; public class Schema extends StringSchema { // $refed class - public class Schema1 extends StringSchema1 { - } + public class Schema1 extends StringSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/responses/response200/content/applicationjson/Schema.java index 92d21d542e7..ddee4b09bb1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefsstring/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakerefsstring.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringSchema; public class Schema extends StringSchema { // $refed class - public class Schema1 extends StringSchema1 { - } + public class Schema1 extends StringSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/QueryParameters.java index 45ef41649c8..228fad9536a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/QueryParameters.java @@ -1,49 +1,27 @@ package org.openapijsonschematools.paths.faketestqueryparamters.put; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.schemas.StringWithValidation; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter0.Schema0; import org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter1.Schema1; import org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter2.Schema2; import org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter3.Schema3; import org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter4.Schema4; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -65,7 +43,8 @@ public class QueryParameters1 implements JsonSchema { "pipe", "refParam", "url" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter0/Schema0.java index ff459b77d88..db1e281a96f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter0/Schema0.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter0; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Items0 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items0.class, arg, configuration); - } - } + public class Items0 extends StringJsonSchema {} + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter1/Schema1.java index ae07377e475..643abbcb5f3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter1/Schema1.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter1; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema1 { // nest classes so all schemas and input/output classes can be public - public class Items1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items1.class, arg, configuration); - } - } + public class Items1 extends StringJsonSchema {} + public class Schema11 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter2/Schema2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter2/Schema2.java index d4ec12cb7df..a1c93217aa8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter2/Schema2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter2/Schema2.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter2; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema2 { // nest classes so all schemas and input/output classes can be public - public class Items2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items2.class, arg, configuration); - } - } + public class Items2 extends StringJsonSchema {} + public class Schema21 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter3/Schema3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter3/Schema3.java index 7af6cddd0f6..8e1584fa523 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter3/Schema3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter3/Schema3.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter3; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema3 { // nest classes so all schemas and input/output classes can be public - public class Items3 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items3.class, arg, configuration); - } - } + public class Items3 extends StringJsonSchema {} + public class Schema31 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter4/Schema4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter4/Schema4.java index bd9ecc06ee7..4540361150b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter4/Schema4.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter4/Schema4.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter4; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema4 { // nest classes so all schemas and input/output classes can be public - public class Items4 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items4.class, arg, configuration); - } - } + public class Items4 extends StringJsonSchema {} + public class Schema41 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter5/Schema5.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter5/Schema5.java index c7b1a29baf4..a6554d22c9e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter5/Schema5.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter5/Schema5.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.faketestqueryparamters.put.parameters.parameter5; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.StringWithValidation; public class Schema5 extends StringWithValidation { // $refed class - public class Schema51 extends StringWithValidation1 { - } + public class Schema51 extends StringWithValidation1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/requestbody/content/applicationoctetstream/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/requestbody/content/applicationoctetstream/Schema.java index f55c3f10d93..1ca917b6c4b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/requestbody/content/applicationoctetstream/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/requestbody/content/applicationoctetstream/Schema.java @@ -1,46 +1,11 @@ package org.openapijsonschematools.paths.fakeuploaddownloadfile.post.requestbody.content.applicationoctetstream; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - }} + // BinarySchema + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/responses/response200/content/applicationoctetstream/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/responses/response200/content/applicationoctetstream/Schema.java index d625ca90ff1..6e8517fc24c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/responses/response200/content/applicationoctetstream/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploaddownloadfile/post/responses/response200/content/applicationoctetstream/Schema.java @@ -1,46 +1,11 @@ package org.openapijsonschematools.paths.fakeuploaddownloadfile.post.responses.response200.content.applicationoctetstream; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - }} + // BinarySchema + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java index a880705510c..7229dcba718 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java @@ -1,58 +1,25 @@ package org.openapijsonschematools.paths.fakeuploadfile.post.requestbody.content.multipartformdata; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public - public class AdditionalMetadata implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalMetadata.class, arg, configuration); - } - } + public class AdditionalMetadata extends StringJsonSchema {} + public class File implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - } + // BinarySchema + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( @@ -64,7 +31,8 @@ public class Schema1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "file" - )); public static T validate(Map arg, SchemaConfiguration configuration) { + )); + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/responses/response200/content/applicationjson/Schema.java index 5a1bd5b468f..0a0f5321d44 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfile/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakeuploadfile.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ApiResponseSchema; public class Schema extends ApiResponseSchema { // $refed class - public class Schema1 extends ApiResponseSchema1 { - } + public class Schema1 extends ApiResponseSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java index 05b940f8f85..9052d4978a5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java @@ -1,49 +1,23 @@ package org.openapijsonschematools.paths.fakeuploadfiles.post.requestbody.content.multipartformdata; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public public class Items implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - } + // BinarySchema + } + public class Files implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/responses/response200/content/applicationjson/Schema.java index 91e71df6ae8..6de4d9edf8e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeuploadfiles/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.fakeuploadfiles.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.ApiResponseSchema; public class Schema extends ApiResponseSchema { // $refed class - public class Schema1 extends ApiResponseSchema1 { - } + public class Schema1 extends ApiResponseSchema1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response1xx/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response1xx/content/applicationjson/Schema.java index f9284951f75..9587dab6d76 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response1xx/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response1xx/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakewildcardresponses.get.responses.response1xx.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response200/content/applicationjson/Schema.java index dcb280abb3c..cb5029140bf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response200/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakewildcardresponses.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response2xx/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response2xx/content/applicationjson/Schema.java index 9bde55a5d83..2fd514839aa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response2xx/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response2xx/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakewildcardresponses.get.responses.response2xx.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response3xx/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response3xx/content/applicationjson/Schema.java index 94d6a0d3e59..4c043970c2c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response3xx/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response3xx/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakewildcardresponses.get.responses.response3xx.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response4xx/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response4xx/content/applicationjson/Schema.java index 976f693bde3..cee975c8b86 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response4xx/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response4xx/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakewildcardresponses.get.responses.response4xx.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response5xx/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response5xx/content/applicationjson/Schema.java index 29d3c76e13e..26666e0ff56 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response5xx/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakewildcardresponses/get/responses/response5xx/content/applicationjson/Schema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.fakewildcardresponses.get.responses.response5xx.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; 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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 extends AnyTypeJsonSchema { - } + public class Schema1 extends AnyTypeJsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java index 194cedc808b..9a6907b020b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java @@ -1,36 +1,13 @@ package org.openapijsonschematools.paths.foo.get.responses.responsedefault.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.schemas.Foo; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/QueryParameters.java index e704a02c164..c0c5a38019e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/QueryParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.petfindbystatus.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.petfindbystatus.get.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class QueryParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "status" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/parameters/parameter0/Schema0.java index 60972bd6bae..9aba7e764b7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/parameters/parameter0/Schema0.java @@ -1,35 +1,10 @@ package org.openapijsonschematools.paths.petfindbystatus.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenList; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema0 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/QueryParameters.java index 987bec117b0..485626dea92 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/QueryParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.petfindbytags.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.petfindbytags.get.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class QueryParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "tags" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/parameters/parameter0/Schema0.java index cb4db9f7f4b..b9256a0b08b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/parameters/parameter0/Schema0.java @@ -1,48 +1,18 @@ package org.openapijsonschematools.paths.petfindbytags.get.parameters.parameter0; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Items0 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Items0.class, arg, configuration); - } - } + public class Items0 extends StringJsonSchema {} + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/HeaderParameters.java index 6ffcb3c8c83..e2696fec901 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/HeaderParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.petpetid.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.petpetid.delete.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class HeaderParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class HeaderParameters1 implements JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/PathParameters.java index 29f45858c70..2e6ff1a3ab9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.petpetid.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.petpetid.delete.parameters.parameter1.Schema1; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "petId" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter0/Schema0.java index a8978478525..20240d5a788 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.petpetid.delete.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter1/Schema1.java index 12cbb18c448..699dbee153b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/parameters/parameter1/Schema1.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.petpetid.delete.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema1 { // nest classes so all schemas and input/output classes can be public - public class Schema11 extends Int64JsonSchema { - } + public class Schema11 extends Int64JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/PathParameters.java index 27d42dcbb76..f9152ac557b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.petpetid.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.petpetid.get.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "petId" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/parameters/parameter0/Schema0.java index 1ff096e820f..086e1b2f6f3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/parameters/parameter0/Schema0.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.petpetid.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 extends Int64JsonSchema { - } + public class Schema01 extends Int64JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationjson/Schema.java index 411da37d800..a5b51b734b9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationjson/Schema.java @@ -1,35 +1,5 @@ package org.openapijsonschematools.paths.petpetid.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Pet; import org.openapijsonschematools.components.schemas.RefPet; @@ -37,6 +7,5 @@ public class Schema extends RefPet { // $refed class - public class Schema1 extends Pet1 { - } + public class Schema1 extends Pet1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationxml/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationxml/Schema.java index fbe5337b089..2555c9eef88 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationxml/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/responses/response200/content/applicationxml/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.petpetid.get.responses.response200.content.applicationxml; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Pet; public class Schema extends Pet { // $refed class - public class Schema1 extends Pet1 { - } + public class Schema1 extends Pet1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/PathParameters.java index a3c1e5ea963..9d6aacb1d64 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.petpetid.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.petpetid.post.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "petId" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/parameters/parameter0/Schema0.java index 33eea5ffed1..0afc8bd5221 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/parameters/parameter0/Schema0.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.petpetid.post.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 extends Int64JsonSchema { - } + public class Schema01 extends Int64JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java index 966e5abf5a2..74c47e97c77 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -1,57 +1,23 @@ package org.openapijsonschematools.paths.petpetid.post.requestbody.content.applicationxwwwformurlencoded; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Name implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Name.class, arg, configuration); - } - } + public class Name extends StringJsonSchema {} + + + public class Status extends StringJsonSchema {} - public class Status implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Status.class, arg, configuration); - } - } public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/PathParameters.java index ce8076cf34d..c14c8f523a5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.petpetiduploadimage.post; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.petpetiduploadimage.post.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "petId" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.java index e0b15be9a81..315cc3bc184 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.petpetiduploadimage.post.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 extends Int64JsonSchema { - } + public class Schema01 extends Int64JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java index 121308e0244..383f0c74cc5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java @@ -1,58 +1,25 @@ package org.openapijsonschematools.paths.petpetiduploadimage.post.requestbody.content.multipartformdata; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.StringJsonSchema; public class Schema { // nest classes so all schemas and input/output classes can be public - public class AdditionalMetadata implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AdditionalMetadata.class, arg, configuration); - } - } + public class AdditionalMetadata extends StringJsonSchema {} + public class File implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - // FileIO, - // bytes, - )); - static final String format = "binary"; - // FileIO, - // bytes, - } + // BinarySchema + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/requestbody/content/applicationjson/Schema.java index f689cdacfa0..1df0698a421 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.storeorder.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Order; public class Schema extends Order { // $refed class - public class Schema1 extends Order1 { - } + public class Schema1 extends Order1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationjson/Schema.java index cff76e9ebda..9039d331698 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.storeorder.post.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Order; public class Schema extends Order { // $refed class - public class Schema1 extends Order1 { - } + public class Schema1 extends Order1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationxml/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationxml/Schema.java index 42306ca20ce..553a34f4c5b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationxml/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorder/post/responses/response200/content/applicationxml/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.storeorder.post.responses.response200.content.applicationxml; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Order; public class Schema extends Order { // $refed class - public class Schema1 extends Order1 { - } + public class Schema1 extends Order1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/PathParameters.java index 9b8be3d6b61..0ca85011729 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.storeorderorderid.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.storeorderorderid.delete.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "order_id" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/parameters/parameter0/Schema0.java index d711cec5213..ac4013d3e49 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.storeorderorderid.delete.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/PathParameters.java index 1f311d8735b..2dbbc3664b4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.storeorderorderid.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.storeorderorderid.get.parameters.parameter0.Schema0; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "order_id" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/parameters/parameter0/Schema0.java index 52f952a2cbe..ab65c1784e8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/parameters/parameter0/Schema0.java @@ -1,35 +1,8 @@ package org.openapijsonschematools.paths.storeorderorderid.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.JsonSchema; public class Schema0 { // nest classes so all schemas and input/output classes can be public diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationjson/Schema.java index 51e3444a3a2..2156e420467 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.storeorderorderid.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Order; public class Schema extends Order { // $refed class - public class Schema1 extends Order1 { - } + public class Schema1 extends Order1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationxml/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationxml/Schema.java index 14445131240..239ce578342 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationxml/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/responses/response200/content/applicationxml/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.storeorderorderid.get.responses.response200.content.applicationxml; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.Order; public class Schema extends Order { // $refed class - public class Schema1 extends Order1 { - } + public class Schema1 extends Order1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/user/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/user/post/requestbody/content/applicationjson/Schema.java index a3fd44bc585..7b3a1b2f887 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/user/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/user/post/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.user.post.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.User; public class Schema extends User { // $refed class - public class Schema1 extends User1 { - } + public class Schema1 extends User1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/QueryParameters.java index 6023188f6af..7783426a47f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/QueryParameters.java @@ -1,45 +1,23 @@ package org.openapijsonschematools.paths.userlogin.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.userlogin.get.parameters.parameter0.Schema0; import org.openapijsonschematools.paths.userlogin.get.parameters.parameter1.Schema1; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class QueryParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class QueryParameters1 implements JsonSchema { @@ -53,7 +31,8 @@ public class QueryParameters1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "password", "username" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(QueryParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter0/Schema0.java index 9fda81c7287..d15412aa3d6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter0/Schema0.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.userlogin.get.parameters.parameter0; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema01.class, arg, configuration); - } - }} + public class Schema01 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter1/Schema1.java index a52b2847949..a59259d9c66 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/parameters/parameter1/Schema1.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.userlogin.get.parameters.parameter1; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema1 { // nest classes so all schemas and input/output classes can be public - public class Schema11 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema11.class, arg, configuration); - } - }} + public class Schema11 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/Headers.java index ecfbd289f8a..8383ed5411e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/Headers.java @@ -1,48 +1,26 @@ package org.openapijsonschematools.paths.userlogin.get.responses.response200; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.headers.int32jsoncontenttypeheader.content.applicationjson.Int32JsonContentTypeHeaderSchema; import org.openapijsonschematools.components.headers.numberheader.NumberHeaderSchema; import org.openapijsonschematools.components.schemas.StringWithValidation; +import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.paths.userlogin.get.responses.response200.headers.xexpiresafter.XExpiresAfterSchema; import org.openapijsonschematools.paths.userlogin.get.responses.response200.headers.xratelimit.content.applicationjson.XRateLimitSchema; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class Headers { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class Headers1 implements JsonSchema { @@ -60,7 +38,8 @@ public class Headers1 implements JsonSchema { "X-Rate-Limit", "int32", "ref-content-schema-header" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Headers1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationjson/Schema.java index 033b065a270..3de76967833 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationjson/Schema.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.userlogin.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema1.class, arg, configuration); - } - }} + public class Schema1 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationxml/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationxml/Schema.java index f16a964a1e0..b3faf33c662 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationxml/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/content/applicationxml/Schema.java @@ -1,45 +1,9 @@ package org.openapijsonschematools.paths.userlogin.get.responses.response200.content.applicationxml; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Schema1.class, arg, configuration); - } - }} + public class Schema1 extends StringJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xexpiresafter/XExpiresAfterSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xexpiresafter/XExpiresAfterSchema.java index 369823010ec..ffff626eb26 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xexpiresafter/XExpiresAfterSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xexpiresafter/XExpiresAfterSchema.java @@ -1,46 +1,9 @@ package org.openapijsonschematools.paths.userlogin.get.responses.response200.headers.xexpiresafter; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class XExpiresAfterSchema { // nest classes so all schemas and input/output classes can be public - public class XExpiresAfterSchema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - static final String format = "date-time"; - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(XExpiresAfterSchema1.class, arg, configuration); - } - }} + public class XExpiresAfterSchema1 extends DateTimeJsonSchema {} +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xratelimit/content/applicationjson/XRateLimitSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xratelimit/content/applicationjson/XRateLimitSchema.java index 0bd1cba6c49..f27578f962f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xratelimit/content/applicationjson/XRateLimitSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/headers/xratelimit/content/applicationjson/XRateLimitSchema.java @@ -1,40 +1,9 @@ package org.openapijsonschematools.paths.userlogin.get.responses.response200.headers.xratelimit.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; public class XRateLimitSchema { // nest classes so all schemas and input/output classes can be public - public class XRateLimitSchema1 extends Int32JsonSchema { - } + public class XRateLimitSchema1 extends Int32JsonSchema {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/delete/PathParameters.java index 539139aa038..1696bb6077d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/delete/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.userusername.delete; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.parameters.pathusername.Schema; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "username" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/PathParameters.java index 08de47aca06..a9ed723e411 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.userusername.get; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.parameters.pathusername.Schema; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "username" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationjson/Schema.java index f9d36707d7e..74644be7e2d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.userusername.get.responses.response200.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.User; public class Schema extends User { // $refed class - public class Schema1 extends User1 { - } + public class Schema1 extends User1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationxml/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationxml/Schema.java index 260e50b414b..31d77c6ebdd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationxml/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/responses/response200/content/applicationxml/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.userusername.get.responses.response200.content.applicationxml; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.User; public class Schema extends User { // $refed class - public class Schema1 extends User1 { - } + public class Schema1 extends User1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java index a3eff0b6329..95f7a900260 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java @@ -1,44 +1,22 @@ package org.openapijsonschematools.paths.userusername.put; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; import java.util.AbstractMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.openapijsonschematools.components.parameters.pathusername.Schema; +import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.AnyTypeJsonSchema; +import org.openapijsonschematools.schemas.FrozenMap; +import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties implements JsonSchema { + public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - } public class PathParameters1 implements JsonSchema { @@ -50,7 +28,8 @@ public class PathParameters1 implements JsonSchema { )); static final Set required = new LinkedHashSet<>(Set.of( "username" - )); static final Class additionalProperties = AdditionalProperties.class; + )); + static final Class additionalProperties = AdditionalProperties.class; public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/requestbody/content/applicationjson/Schema.java index d3daef67056..fce9041e667 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/requestbody/content/applicationjson/Schema.java @@ -1,41 +1,10 @@ package org.openapijsonschematools.paths.userusername.put.requestbody.content.applicationjson; -import org.openapijsonschematools.configurations.SchemaConfiguration; -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; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.openapijsonschematools.components.schemas.User; public class Schema extends User { // $refed class - public class Schema1 extends User1 { - } + public class Schema1 extends User1 {} } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/AnyTypeJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/AnyTypeJsonSchema.java index 3c15f99447f..2a4056fbd9f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/AnyTypeJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/AnyTypeJsonSchema.java @@ -4,10 +4,8 @@ import java.time.LocalDate; import java.time.ZonedDateTime; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.UUID; @@ -48,6 +46,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/StringJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/StringJsonSchema.java index 2701f084ab2..96e0881b46c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/StringJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/StringJsonSchema.java @@ -27,4 +27,8 @@ public static String validate(ZonedDateTime arg, SchemaConfiguration configurati public static String validate(LocalDate arg, SchemaConfiguration configuration) { return JsonSchema.validate(StringJsonSchema.class, arg, configuration); } + + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(StringJsonSchema.class, arg, configuration); + } } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java index d4022776a9c..486bab0ec96 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java @@ -1417,11 +1417,6 @@ public void setSupportJava6(boolean value) { this.supportJava6 = value; } - @Override - public CodegenPatternInfo getPatternInfo(String pattern) { - return new CodegenPatternInfo(escapeText(pattern), null); - } - @Override public String sanitizeTag(String tag) { tag = camelize(underscore(sanitizeName(tag))); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 5463ff19aba..d6ce79d76b8 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -2096,7 +2096,7 @@ public String getImport(CodegenRefInfo refInfo) { * @return all the imports */ @Override - public Set getImports(CodegenSchema schema, FeatureSet featureSet) { + public Set getImports(String sourceJsonPath, CodegenSchema schema, FeatureSet featureSet) { Set imports = new HashSet<>(); if (schema.discriminator != null && schema.discriminator.mappedModels != null) { CodegenDiscriminator disc = schema.discriminator; @@ -2132,21 +2132,21 @@ public Set getImports(CodegenSchema schema, FeatureSet featureSet) { Stream allSchemas = Stream.of( allOfs.stream(), anyOfs.stream(), oneOfs.stream(), notSchemas.stream()).flatMap(i -> i); for (CodegenSchema cs: allSchemas.collect(Collectors.toList())) { - imports.addAll(getImports(cs, featureSet)); + imports.addAll(getImports(sourceJsonPath, cs, featureSet)); } } // items can exist for AnyType and type array if (schema.items != null && schema.types != null && schema.types.contains("array")) { - imports.addAll(getImports(schema.items, featureSet)); + imports.addAll(getImports(sourceJsonPath, schema.items, featureSet)); } // additionalProperties can exist for AnyType and type object if (schema.additionalProperties != null) { - imports.addAll(getImports(schema.additionalProperties, featureSet)); + imports.addAll(getImports(sourceJsonPath, schema.additionalProperties, featureSet)); } // vars can exist for AnyType and type object if (schema.properties != null && !schema.properties.isEmpty()) { for (CodegenSchema cs: schema.properties.values()) { - imports.addAll(getImports(cs, featureSet)); + imports.addAll(getImports(sourceJsonPath, cs, featureSet)); } } // referenced or inline schemas @@ -2292,7 +2292,7 @@ public CodegenSchema fromSchema(Schema p, String sourceJsonPath, String currentJ // import from $ref property.imports = new TreeSet<>(); assert generatorMetadata != null; - addImports(property.imports, getImports(property, generatorMetadata.getFeatureSet())); + addImports(property.imports, getImports(sourceJsonPath, property, generatorMetadata.getFeatureSet())); } if (p.getSpecVersion().compareTo(SpecVersion.V31) < 0) { // stop processing if version is less than 3.1.0 @@ -2552,7 +2552,7 @@ public CodegenSchema fromSchema(Schema p, String sourceJsonPath, String currentJ // imports from properties/items/additionalProperties/oneOf/anyOf/allOf/not property.imports = new TreeSet<>(); assert generatorMetadata != null; - addImports(property.imports, getImports(property, generatorMetadata.getFeatureSet())); + addImports(property.imports, getImports(sourceJsonPath, property, generatorMetadata.getFeatureSet())); } LOGGER.debug("debugging fromSchema return: {}", property); @@ -2966,7 +2966,7 @@ private CodegenSchema getXParametersSchema(HashMap xParametersPr xParametersSchema.setAdditionalProperties(Boolean.FALSE); CodegenSchema schema = fromSchema(xParametersSchema, sourceJsonPath, currentJsonPath); schema.imports = new TreeSet<>(); - addImports(schema.imports, getImports(schema, generatorMetadata.getFeatureSet())); + addImports(schema.imports, getImports(sourceJsonPath, schema, generatorMetadata.getFeatureSet())); return schema; } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 1e4cbea091d..7c0fed7deb1 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -117,7 +117,7 @@ public interface Generator { String getSchemaFilename(String jsonPath); String getSchemaCamelCaseName(String name, @NotNull String sourceJsonPath); - Set getImports(CodegenSchema schema, FeatureSet featureSet); + Set getImports(String sourceJsonPath, CodegenSchema schema, FeatureSet featureSet); String toContentTypeFilename(String name); String toParamName(String name); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 5864cf38927..f5d1c1efb84 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -21,10 +21,12 @@ import org.openapijsonschematools.codegen.common.ModelUtils; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.models.VendorExtension; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; @@ -48,6 +50,8 @@ import javax.validation.constraints.NotNull; import java.io.File; import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.google.common.base.CaseFormat.LOWER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; @@ -179,6 +183,7 @@ public JavaClientGenerator() { // TODO: Move GlobalFeature.ParameterizedServer to library: jersey after moving featureSet to generatorMetadata modifyFeatureSet(features -> features .includeDocumentationFeatures(DocumentationFeature.Readme) + .includeSchemaFeatures(SchemaFeature.AllOf, SchemaFeature.AnyOf, SchemaFeature.OneOf, SchemaFeature.Not) ); outputFolder = "generated-code" + File.separator + "java"; @@ -1110,12 +1115,240 @@ protected boolean needToImport(String type) { } @Override - public Set getImports(CodegenSchema schema, FeatureSet featureSet) { - if (schema.jsonPath.startsWith("#/components/schemas/")) { - // all of those components are in the same package, so they don't need to import each other - return new HashSet<>(); + public Set getImports(String sourceJsonPath, CodegenSchema schema, FeatureSet featureSet) { + Set imports = new HashSet<>(); + // Note: discriminator imports do not need to be added for Java + // because they are in the package namespace in components.schemas + if (schema.allOf != null || schema.anyOf != null || schema.oneOf != null || schema.not != null) { + List allOfs = Collections.emptyList(); + List oneOfs = Collections.emptyList(); + List anyOfs = Collections.emptyList(); + List notSchemas = Collections.emptyList(); + if (schema.allOf != null && featureSet.getSchemaSupportFeatures().contains(SchemaFeature.AllOf)) { + allOfs = schema.allOf; + } + if (schema.oneOf != null && featureSet.getSchemaSupportFeatures().contains(SchemaFeature.OneOf)) { + oneOfs = schema.oneOf; + } + if (schema.anyOf != null && featureSet.getSchemaSupportFeatures().contains(SchemaFeature.AnyOf)) { + anyOfs = schema.anyOf; + } + if (schema.not != null && featureSet.getSchemaSupportFeatures().contains(SchemaFeature.Not)) { + notSchemas = Collections.singletonList(schema.not); + } + Stream allSchemas = Stream.of( + allOfs.stream(), anyOfs.stream(), oneOfs.stream(), notSchemas.stream()).flatMap(i -> i); + for (CodegenSchema cs: allSchemas.collect(Collectors.toList())) { + imports.addAll(getImports(sourceJsonPath, cs, featureSet)); + } + } + // items can exist for AnyType and type array + if (schema.items != null && schema.types != null && schema.types.contains("array")) { + imports.addAll(getImports(sourceJsonPath, schema.items, featureSet)); + } + // additionalProperties can exist for AnyType and type object + if (schema.additionalProperties != null) { + imports.addAll(getImports(sourceJsonPath, schema.additionalProperties, featureSet)); + } + // vars can exist for AnyType and type object + if (schema.properties != null && !schema.properties.isEmpty()) { + for (CodegenSchema cs: schema.properties.values()) { + imports.addAll(getImports(sourceJsonPath, cs, featureSet)); + } + } + // referenced or inline schemas + if (!sourceJsonPath.startsWith("#/components/schemas/") && schema.refInfo != null && schema.refInfo.refModule != null) { + imports.add(getImport(schema.refInfo)); + CodegenSchema ref = schema.refInfo.ref; + if (ref.refInfo != null && schema.refInfo.refModule != null && deepestRefSchemaImportNeeded) { + CodegenRefInfo deepestRefInfo = schema.refInfo; + while (deepestRefInfo.ref.refInfo != null) { + deepestRefInfo = deepestRefInfo.ref.refInfo; + } + imports.add(getImport(deepestRefInfo)); + } + } + if (schema.refInfo != null) { + // todo remove this when ref is supported with adjacent properties + return imports; + } + if (schema.types != null) { + if (schema.types.size() == 1) { + if (schema.types.contains("boolean")) { + if (schema.isSimpleBoolean()) { + imports.add("import "+packageName + ".schemas.BooleanJsonSchema;"); + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + } + } else if (schema.types.contains("null")) { + if (schema.isSimpleNull()) { + imports.add("import "+packageName + ".schemas.NullJsonSchema;"); + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + } + } else if (schema.types.contains("integer")) { + if (schema.isSimpleInteger()) { + if (schema.format == null) { + imports.add("import "+packageName + ".schemas.IntJsonSchema;"); + } else if (schema.format.equals("int32")) { + imports.add("import "+packageName + ".schemas.Int32JsonSchema;"); + } else if (schema.format.equals("int64")) { + imports.add("import "+packageName + ".schemas.Int64JsonSchema;"); + } + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + } + } else if (schema.types.contains("number")) { + if (schema.isSimpleNumber()) { + if (schema.format == null) { + imports.add("import "+packageName + ".schemas.NumberJsonSchema;"); + } else if (schema.format.equals("int32")) { + imports.add("import "+packageName + ".schemas.Int32JsonSchema;"); + } else if (schema.format.equals("int64")) { + imports.add("import "+packageName + ".schemas.Int64JsonSchema;"); + } else if (schema.format.equals("float")) { + imports.add("import "+packageName + ".schemas.FloatJsonSchema;"); + } else if (schema.format.equals("double")) { + imports.add("import "+packageName + ".schemas.DoubleJsonSchema;"); + } + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + } + } else if (schema.types.contains("string")) { + if (schema.isSimpleString()) { + if (schema.format == null) { + imports.add("import "+packageName + ".schemas.StringJsonSchema;"); + } else if (schema.format.equals("date")) { + imports.add("import "+packageName + ".schemas.DateJsonSchema;"); + } else if (schema.format.equals("date-time")) { + imports.add("import "+packageName + ".schemas.DateTimeJsonSchema;"); + } else if (schema.format.equals("number")) { + imports.add("import "+packageName + ".schemas.DecimalJsonSchema;"); + } else if (schema.format.equals("uuid")) { + imports.add("import "+packageName + ".schemas.UuidJsonSchema;"); + } else if (schema.format.equals("byte")) { + // todo implement this + imports.add("import "+packageName + ".schemas.StringJsonSchema;"); + } else if (schema.format.equals("binary")) { + // todo implement this + imports.add("import "+packageName + ".schemas.JsonSchema;"); + } + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + addStringSchemaImports(imports, schema); + } + } else if (schema.types.contains("object")) { + if (schema.isSimpleObject()) { + imports.add("import "+packageName + ".schemas.MapJsonSchema;"); + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + addMapSchemaImports(imports, schema); + } + } else if (schema.types.contains("array")) { + if (schema.isSimpleArray()) { + imports.add("import "+packageName + ".schemas.ListJsonSchema;"); + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + addListSchemaImports(imports, schema); + } + } + } else if (schema.types.size() > 1) { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + if (schema.types.contains("string")) { + addStringSchemaImports(imports, schema); + } + if (schema.types.contains("array")) { + addListSchemaImports(imports, schema); + } + if (schema.types.contains("object")) { + addMapSchemaImports(imports, schema); + } + } + } else { + // no types + if (schema.isBooleanSchemaTrue) { + imports.add("import "+packageName + ".schemas.AnyTypeJsonSchema;"); + } else if (schema.isBooleanSchemaFalse) { + imports.add("import "+packageName + ".schemas.NotAnyTypeJsonSchema;"); + } else if (schema.isSimpleAnyType()) { + imports.add("import "+packageName + ".schemas.AnyTypeJsonSchema;"); + } else { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import java.time.LocalDate;"); + imports.add("import java.time.ZonedDateTime;"); + imports.add("import java.util.UUID;"); + imports.add("import "+packageName + ".schemas.FrozenList;"); + imports.add("import java.util.List;"); + imports.add("import "+packageName + ".schemas.FrozenMap;"); + imports.add("import java.util.Map;"); + if (schema.properties != null) { + imports.add("import java.util.Map;"); + imports.add("import java.util.LinkedHashMap;"); + imports.add("import java.util.AbstractMap;"); + } + if (schema.requiredProperties != null) { + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + } + } + } + return imports; + } + + private void addMapSchemaImports(Set imports, CodegenSchema schema) { + imports.add("import "+packageName + ".schemas.FrozenMap;"); + imports.add("import java.util.Map;"); + if (schema.properties != null) { + imports.add("import java.util.Map;"); + imports.add("import java.util.LinkedHashMap;"); + imports.add("import java.util.AbstractMap;"); + } + if (schema.requiredProperties != null) { + imports.add("import java.util.LinkedHashSet;"); + imports.add("import java.util.Set;"); + } + } + + private void addListSchemaImports(Set imports, CodegenSchema schema) { + imports.add("import "+packageName + ".schemas.FrozenList;"); + imports.add("import java.util.List;"); + } + + private void addStringSchemaImports(Set imports, CodegenSchema schema) { + if (schema.format != null) { + if (schema.format.equals("date")) { + imports.add("import java.time.LocalDate;"); + } else if (schema.format.equals("date-time")) { + imports.add("import java.time.ZonedDateTime;"); + } else if (schema.format.equals("uuid")) { + imports.add("import java.util.UUID;"); + } } - return super.getImports(schema, featureSet); } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java index 98965098c70..fc617f76682 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java @@ -129,6 +129,128 @@ public boolean hasValidation() { return maxItems != null || minItems != null || minProperties != null || maxProperties != null || minLength != null || maxLength != null || multipleOf != null || patternInfo != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null || uniqueItems != null; } + public boolean isSimpleBoolean() { + if (types == null) { + return false; + } + if (types.size() != 1) { + return false; + } + if (!types.contains("boolean")) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || enumInfo != null || constInfo != null) { + return false; + } + return true; + } + + public boolean isSimpleNull() { + if (types == null) { + return false; + } + if (types.size() != 1) { + return false; + } + if (!types.contains("null")) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || enumInfo != null || constInfo != null) { + return false; + } + return true; + } + + public boolean isSimpleInteger() { + if (types == null) { + return false; + } + if (types.size() != 1) { + return false; + } + if (!types.contains("integer")) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || enumInfo != null || constInfo != null || maximum != null || minimum != null || multipleOf != null) { + return false; + } + return true; + } + + public boolean isSimpleNumber() { + if (types == null) { + return false; + } + if (types.size() != 1) { + return false; + } + if (!types.contains("number")) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || enumInfo != null || constInfo != null || maximum != null || minimum != null || multipleOf != null) { + return false; + } + return true; + } + + public boolean isSimpleString() { + if (types == null) { + return false; + } + if (types.size() != 1) { + return false; + } + if (!types.contains("string")) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || enumInfo != null || constInfo != null || defaultValue != null || maxLength != null || minLength != null || patternInfo != null) { + return false; + } + return true; + } + + public boolean isSimpleObject() { + if (types == null) { + return false; + } + if (types.size() != 1) { + return false; + } + if (!types.contains("object")) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || properties != null || requiredProperties != null || hasDiscriminatorWithNonEmptyMapping() != false || additionalProperties != null || dependentRequired != null || dependentSchemas != null || propertyNames != null || maxProperties != null || minProperties != null || patternProperties != null || unevaluatedProperties != null) { + return false; + } + return true; + } + + public boolean isSimpleArray() { + if (types == null) { + return false; + } + if (types.size() != 1) { + return false; + } + if (!types.contains("array")) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || items != null || uniqueItems != null || contains != null || maxContains != null || minContains != null || maxItems != null || minItems != null || prefixItems != null || unevaluatedItems != null) { + return false; + } + return true; + } + + public boolean isSimpleAnyType() { + if (types != null) { + return false; + } + if (allOf != null || anyOf != null || oneOf != null || not != null || if_ != null || then != null || else_ != null || enumInfo != null || constInfo != null || properties != null || requiredProperties != null || hasDiscriminatorWithNonEmptyMapping() != false || additionalProperties != null || dependentRequired != null || dependentSchemas != null || propertyNames != null || maxProperties != null || minProperties != null || patternProperties != null || unevaluatedProperties != null || items != null || uniqueItems != null || maxItems != null || minItems != null || contains != null || maxContains != null || minContains != null || prefixItems != null || unevaluatedItems != null || format != null || maxLength != null || minLength != null || maximum != null || minimum != null || multipleOf != null || patternInfo != null || refInfo != null) { + return false; + } + return true; + } + public CodegenSchema typeSchema() { CodegenSchema schema = new CodegenSchema(); schema.refInfo = refInfo; diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema.hbs index 25d40ff5f9f..f49eec30ebb 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema.hbs @@ -1,7 +1,7 @@ {{#with schema}} package {{packageName}}.{{subpackage}}; {{#if refInfo}} -{{> src/main/java/org/openapitools/components/schemas/_SchemaSharedImports }} + {{> _helper_imports }} public class {{containerJsonPathPiece.camelCase}} extends {{refInfo.refModule}} { @@ -9,7 +9,6 @@ public class {{containerJsonPathPiece.camelCase}} extends {{refInfo.refModule}} {{> src/main/java/org/openapitools/components/schemas/SchemaClass/SchemaClass identifierPieces=(append identifierPieces jsonPathPiece) simpleRef=true }} } {{else}} -{{> src/main/java/org/openapitools/components/schemas/_SchemaSharedImports }} {{> _helper_imports }} public class {{containerJsonPathPiece.camelCase}} { diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/SchemaClass.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/SchemaClass.hbs index 649abbec785..a8525790563 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/SchemaClass.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/SchemaClass.hbs @@ -40,11 +40,19 @@ {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_varEqualsClass }} {{/or}} {{else}} - {{#or allOf anyOf oneOf not if_ then else_ enumInfo constInfo defaultValue (neq maxLength null) (neq minLength null) patternInfo }} + {{#eq this "string"}} + {{#or allOf anyOf oneOf not if_ then else_ enumInfo constInfo defaultValue (neq maxLength null) (neq minLength null) patternInfo }} {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_string }} + {{else}} +{{> src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_varEqualsClass }} + {{/or}} {{else}} + {{#or allOf anyOf oneOf not if_ then else_ enumInfo constInfo }} +{{> src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_null }} + {{else}} {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_varEqualsClass }} - {{/or}} + {{/or}} + {{/eq}} {{/or}} {{/eq}} {{/eq}} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_null.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_null.hbs new file mode 100644 index 00000000000..7abebe6083a --- /dev/null +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_null.hbs @@ -0,0 +1,45 @@ + + +public class {{jsonPathPiece.camelCase}} implements JsonSchema { +{{#if componentModule}} + /* + 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. + {{#if description}} + + {{{unescapedDescription}}} + {{/if}} + */ +{{/if}} + {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_types }} +{{#if enumInfo}} + {{!> components/schemas/schema_cls/_enum }} +{{/if}} +{{#if constInfo}} + {{!> components/schemas/schema_cls/_const }} +{{/if}} +{{#if allOf}} + {{!> components/schemas/schema_cls/_all_of }} +{{/if}} +{{#if anyOf}} + {{!> components/schemas/schema_cls/_any_of }} +{{/if}} +{{#if oneOf}} + {{!> components/schemas/schema_cls/_one_of }} +{{/if}} +{{#if not}} + {{!> components/schemas/schema_cls/_not }} +{{/if}} +{{#if if_}} + {{!> components/schemas/schema_cls/_if }} +{{/if}} +{{#if then}} + {{!> components/schemas/schema_cls/_then }} +{{/if}} +{{#if else_}} + {{!> components/schemas/schema_cls/_else }} +{{/if}} + {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_validate }} +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_varEqualsClass.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_varEqualsClass.hbs index 1010370647c..665bfc69621 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_varEqualsClass.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_varEqualsClass.hbs @@ -2,9 +2,9 @@ {{#or isBooleanSchemaTrue isBooleanSchemaFalse}} {{#if isBooleanSchemaTrue}} -public class {{../jsonPathPiece.camelCase}} extends AnyTypeJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends AnyTypeJsonSchema {} {{else}} -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema {{/if}} {{else}} @@ -12,11 +12,11 @@ public class {{jsonPathPiece.camelCase}} implements JsonSchema { {{#if simpleRef}} {{#if refInfo.refModule}} {{#with getDeepestRef}} -public class {{../jsonPathPiece.camelCase}} extends {{jsonPathPiece.camelCase}} { +public class {{../jsonPathPiece.camelCase}} extends {{jsonPathPiece.camelCase}} {} {{/with}} {{else}} {{#with refInfo.ref}} -public class {{../jsonPathPiece.camelCase}} extends {{jsonPathPiece.camelCase}} { +public class {{../jsonPathPiece.camelCase}} extends {{jsonPathPiece.camelCase}} {} {{/with}} {{/if}} {{else}} @@ -30,47 +30,49 @@ public class {{jsonPathPiece.camelCase}} implements JsonSchema { {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_validate }} {{/with}} {{/if}} +} {{/if}} {{else}} {{#eq types null}} -public class {{../jsonPathPiece.camelCase}} extends AnyTypeJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends AnyTypeJsonSchema {} {{else}} {{#each types}} {{#eq this "null"}} -public class {{../jsonPathPiece.camelCase}} extends NullJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends NullJsonSchema {} {{/eq}} {{#eq this "object"}} -public class {{../jsonPathPiece.camelCase}} extends MapJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends MapJsonSchema {} {{/eq}} {{#eq this "array"}} -public class {{../jsonPathPiece.camelCase}} extends ListJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends ListJsonSchema {} {{/eq}} {{#eq this "boolean"}} -public class {{../jsonPathPiece.camelCase}} extends BooleanJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends BooleanJsonSchema {} {{/eq}} {{#eq this "string"}} {{#eq ../format "date"}} -public class {{../jsonPathPiece.camelCase}} extends DateJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends DateJsonSchema {} {{/eq}} {{#eq ../format "date-time"}} -public class {{../jsonPathPiece.camelCase}} extends DateTimeJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends DateTimeJsonSchema {} {{/eq}} {{#eq ../format "uuid"}} -public class {{../jsonPathPiece.camelCase}} extends UuidJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends UuidJsonSchema {} {{/eq}} {{#eq ../format "number"}} -public class {{../jsonPathPiece.camelCase}} extends NumberJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends DecimalJsonSchema {} {{/eq}} {{#eq ../format "binary"}} public class {{jsonPathPiece.camelCase}} implements JsonSchema { // BinarySchema +} {{/eq}} {{#neq ../format "date"}} {{#neq ../format "date-time"}} {{#neq ../format "uuid"}} {{#neq ../format "number"}} {{#neq ../format "binary"}} -public class {{../jsonPathPiece.camelCase}} extends StringJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends StringJsonSchema {} {{/neq}} {{/neq}} {{/neq}} @@ -79,29 +81,31 @@ public class {{../jsonPathPiece.camelCase}} extends StringJsonSchema { {{/eq}} {{#eq this "integer"}} {{#eq ../format "int32"}} -public class {{../jsonPathPiece.camelCase}} extends Int32JsonSchema { +public class {{../jsonPathPiece.camelCase}} extends Int32JsonSchema {} {{/eq}} {{#eq ../format "int64"}} -public class {{../jsonPathPiece.camelCase}} extends Int64JsonSchema { +public class {{../jsonPathPiece.camelCase}} extends Int64JsonSchema {} {{/eq}} {{#neq ../format "int32"}} {{#neq ../format "int64"}} -public class {{../jsonPathPiece.camelCase}} extends IntJsonSchema { +public class {{../jsonPathPiece.camelCase}} extends IntJsonSchema {} {{/neq}} {{/neq}} {{/eq}} {{#eq this "number"}} - {{#eq ../format "float"}} -public class {{../jsonPathPiece.camelCase}} extends FloatJsonSchema { + {{#eq ../format null}} +public class {{../jsonPathPiece.camelCase}} extends NumberJsonSchema {} + {{else}} + {{#eq ../format "float"}} +public class {{../jsonPathPiece.camelCase}} extends FloatJsonSchema {} + {{else}} + {{#eq ../format "double"}} +public class {{../jsonPathPiece.camelCase}} extends DoubleJsonSchema {} + {{/eq}} + {{/eq}} {{/eq}} - {{#neq ../format "float"}} - {{#neq ../format "double"}} -public class {{../jsonPathPiece.camelCase}} extends DoubleJsonSchema { - {{/neq}} - {{/neq}} {{/eq}} {{/each}} {{/eq}} {{/if}} {{/or}} -} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_required.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_required.hbs index 2a27d26e6d4..b39cabf7fe9 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_required.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_required.hbs @@ -2,4 +2,4 @@ static final Set required = new LinkedHashSet<>(Set.of( {{#each requiredProperties}} "{{{@key.original}}}"{{#unless @last}},{{/unless}} {{/each}} -)); \ No newline at end of file +)); diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_validate.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_validate.hbs index 4428bb5cba2..fb6c3d92b9f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_validate.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_validate.hbs @@ -144,6 +144,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration) return JsonSchema.validate({{#if includeContainer}}{{containerJsonPathPiece.camelCase}}.{{/if}}{{jsonPathPiece.camelCase}}.class, arg, configuration); } +public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate({{#if includeContainer}}{{containerJsonPathPiece.camelCase}}.{{/if}}{{jsonPathPiece.camelCase}}.class, arg, configuration); +} + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate({{#if includeContainer}}{{containerJsonPathPiece.camelCase}}.{{/if}}{{jsonPathPiece.camelCase}}.class, arg, configuration); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_SchemaSharedImports.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_SchemaSharedImports.hbs deleted file mode 100644 index 7aff70ccd6b..00000000000 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_SchemaSharedImports.hbs +++ /dev/null @@ -1,31 +0,0 @@ -import {{packageName}}.configurations.SchemaConfiguration; -import {{packageName}}.schemas.AnyTypeJsonSchema; -import {{packageName}}.schemas.BooleanJsonSchema; -import {{packageName}}.schemas.DateJsonSchema; -import {{packageName}}.schemas.DateTimeJsonSchema; -import {{packageName}}.schemas.DecimalJsonSchema; -import {{packageName}}.schemas.DoubleJsonSchema; -import {{packageName}}.schemas.FloatJsonSchema; -import {{packageName}}.schemas.FrozenList; -import {{packageName}}.schemas.FrozenMap; -import {{packageName}}.schemas.Int32JsonSchema; -import {{packageName}}.schemas.Int64JsonSchema; -import {{packageName}}.schemas.IntJsonSchema; -import {{packageName}}.schemas.JsonSchema; -import {{packageName}}.schemas.ListJsonSchema; -import {{packageName}}.schemas.MapJsonSchema; -import {{packageName}}.schemas.NotAnyTypeJsonSchema; -import {{packageName}}.schemas.NullJsonSchema; -import {{packageName}}.schemas.NumberJsonSchema; -import {{packageName}}.schemas.StringJsonSchema; -import {{packageName}}.schemas.UnsetAnyTypeJsonSchema; -import {{packageName}}.schemas.UuidJsonSchema; - -import java.time.LocalDate; -import java.time.ZonedDateTime; -import java.util.AbstractMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/AnyTypeJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/AnyTypeJsonSchema.hbs index c161e9d0867..40a520236d2 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/AnyTypeJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/AnyTypeJsonSchema.hbs @@ -4,10 +4,8 @@ import {{{packageName}}}.configurations.SchemaConfiguration; import java.time.LocalDate; import java.time.ZonedDateTime; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.UUID; @@ -48,6 +46,10 @@ public class AnyTypeJsonSchema implements JsonSchema { return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); } + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); + } + public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/StringJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/StringJsonSchema.hbs index 5c8bf9a786a..c65a45c7da9 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/StringJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/StringJsonSchema.hbs @@ -27,4 +27,8 @@ public class StringJsonSchema implements JsonSchema { public static String validate(LocalDate arg, SchemaConfiguration configuration) { return JsonSchema.validate(StringJsonSchema.class, arg, configuration); } + + public static String validate(UUID arg, SchemaConfiguration configuration) { + return JsonSchema.validate(StringJsonSchema.class, arg, configuration); + } }