From 4d831fd5552e9820b26d459fcedd4c1a5bbab832 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sat, 18 Nov 2023 17:58:54 -0800 Subject: [PATCH 01/15] Adds output map types --- .../responses/headerswithnobody/Headers.java | 6 +++ .../Headers.java | 6 +++ .../content/applicationjson/Schema.java | 6 +++ .../successwithjsonapiresponse/Headers.java | 6 +++ .../schemas/AbstractStepMessage.java | 6 +++ .../schemas/AdditionalPropertiesClass.java | 43 +++++++++++++++++++ .../AdditionalPropertiesValidator.java | 18 ++++++++ .../AdditionalPropertiesWithArrayOfEnums.java | 6 +++ .../components/schemas/Address.java | 6 +++ .../components/schemas/Animal.java | 6 +++ .../components/schemas/AnyTypeAndFormat.java | 6 +++ .../components/schemas/ApiResponseSchema.java | 6 +++ .../components/schemas/Apple.java | 6 +++ .../components/schemas/AppleReq.java | 6 +++ .../schemas/ArrayOfArrayOfNumberOnly.java | 6 +++ .../components/schemas/ArrayOfNumberOnly.java | 6 +++ .../components/schemas/ArrayTest.java | 6 +++ .../components/schemas/Banana.java | 6 +++ .../components/schemas/BananaReq.java | 6 +++ .../components/schemas/BasquePig.java | 6 +++ .../components/schemas/Capitalization.java | 6 +++ .../components/schemas/Cat.java | 6 +++ .../components/schemas/Category.java | 6 +++ .../components/schemas/ChildCat.java | 6 +++ .../components/schemas/ClassModel.java | 6 +++ .../components/schemas/Client.java | 6 +++ .../schemas/ComplexQuadrilateral.java | 6 +++ .../components/schemas/DanishPig.java | 6 +++ .../components/schemas/Dog.java | 6 +++ .../components/schemas/Drawing.java | 6 +++ .../components/schemas/EnumArrays.java | 6 +++ .../components/schemas/EnumTest.java | 6 +++ .../schemas/EquilateralTriangle.java | 6 +++ .../components/schemas/File.java | 6 +++ .../schemas/FileSchemaTestClass.java | 6 +++ .../components/schemas/Foo.java | 6 +++ .../components/schemas/FormatTest.java | 6 +++ .../components/schemas/FromSchema.java | 6 +++ .../components/schemas/Fruit.java | 6 +++ .../components/schemas/GmFruit.java | 6 +++ .../components/schemas/GrandparentAnimal.java | 6 +++ .../components/schemas/HasOnlyReadOnly.java | 6 +++ .../components/schemas/HealthCheckResult.java | 6 +++ .../components/schemas/IsoscelesTriangle.java | 6 +++ .../JSONPatchRequestAddReplaceTest.java | 6 +++ .../schemas/JSONPatchRequestMoveCopy.java | 6 +++ .../schemas/JSONPatchRequestRemove.java | 6 +++ .../components/schemas/MapTest.java | 30 +++++++++++++ ...ropertiesAndAdditionalPropertiesClass.java | 12 ++++++ .../components/schemas/Money.java | 6 +++ .../components/schemas/MyObjectDto.java | 6 +++ .../components/schemas/Name.java | 6 +++ .../schemas/NoAdditionalProperties.java | 6 +++ .../components/schemas/NullableClass.java | 24 +++++++++++ .../components/schemas/NumberOnly.java | 6 +++ .../schemas/ObjWithRequiredProps.java | 6 +++ .../schemas/ObjWithRequiredPropsBase.java | 6 +++ .../ObjectModelWithArgAndArgsProperties.java | 6 +++ .../schemas/ObjectModelWithRefProps.java | 6 +++ ...hAllOfWithReqTestPropFromUnsetAddProp.java | 6 +++ .../ObjectWithCollidingProperties.java | 6 +++ .../schemas/ObjectWithDecimalProperties.java | 6 +++ .../ObjectWithDifficultlyNamedProps.java | 6 +++ .../ObjectWithInlineCompositionProperty.java | 6 +++ ...ObjectWithInvalidNamedRefedProperties.java | 6 +++ .../ObjectWithNonIntersectingValues.java | 6 +++ .../schemas/ObjectWithOnlyOptionalProps.java | 6 +++ .../schemas/ObjectWithOptionalTestProp.java | 6 +++ .../components/schemas/Order.java | 6 +++ .../schemas/PaginatedResultMyObjectDto.java | 6 +++ .../components/schemas/Pet.java | 6 +++ .../components/schemas/Player.java | 6 +++ .../components/schemas/PublicKey.java | 6 +++ .../schemas/QuadrilateralInterface.java | 6 +++ .../components/schemas/ReadOnlyFirst.java | 6 +++ .../schemas/ReqPropsFromExplicitAddProps.java | 6 +++ .../schemas/ReqPropsFromTrueAddProps.java | 6 +++ .../schemas/ReqPropsFromUnsetAddProps.java | 6 +++ .../components/schemas/ReturnSchema.java | 6 +++ .../components/schemas/ScaleneTriangle.java | 6 +++ .../components/schemas/Schema200Response.java | 6 +++ .../schemas/SelfReferencingObjectModel.java | 6 +++ .../schemas/SimpleQuadrilateral.java | 6 +++ .../components/schemas/SpecialModelname.java | 6 +++ .../components/schemas/StringBooleanMap.java | 6 +++ .../components/schemas/Tag.java | 6 +++ .../components/schemas/TriangleInterface.java | 6 +++ .../components/schemas/User.java | 6 +++ .../components/schemas/Whale.java | 6 +++ .../components/schemas/Zebra.java | 6 +++ .../delete/HeaderParameters.java | 6 +++ .../delete/PathParameters.java | 6 +++ .../commonparamsubdir/get/PathParameters.java | 6 +++ .../get/QueryParameters.java | 6 +++ .../post/HeaderParameters.java | 6 +++ .../post/PathParameters.java | 6 +++ .../paths/fake/delete/HeaderParameters.java | 6 +++ .../paths/fake/delete/QueryParameters.java | 6 +++ .../paths/fake/get/HeaderParameters.java | 6 +++ .../paths/fake/get/QueryParameters.java | 6 +++ .../applicationxwwwformurlencoded/Schema.java | 6 +++ .../applicationxwwwformurlencoded/Schema.java | 6 +++ .../put/QueryParameters.java | 6 +++ .../put/QueryParameters.java | 6 +++ .../delete/PathParameters.java | 6 +++ .../content/applicationjson/Schema.java | 6 +++ .../post/QueryParameters.java | 6 +++ .../post/parameters/parameter1/Schema1.java | 6 +++ .../content/multipartformdata/Schema.java | 6 +++ .../content/multipartformdata/Schema.java | 6 +++ .../applicationxwwwformurlencoded/Schema.java | 6 +++ .../content/applicationjson/Schema.java | 6 +++ .../content/multipartformdata/Schema.java | 6 +++ .../fakeobjinquery/get/QueryParameters.java | 6 +++ .../get/parameters/parameter0/Schema0.java | 6 +++ .../post/CookieParameters.java | 6 +++ .../post/HeaderParameters.java | 6 +++ .../post/PathParameters.java | 6 +++ .../post/QueryParameters.java | 6 +++ .../post/PathParameters.java | 6 +++ .../content/multipartformdata/Schema.java | 6 +++ .../get/QueryParameters.java | 6 +++ .../get/QueryParameters.java | 6 +++ .../put/QueryParameters.java | 6 +++ .../content/multipartformdata/Schema.java | 6 +++ .../content/multipartformdata/Schema.java | 6 +++ .../content/applicationjson/Schema.java | 6 +++ .../petfindbystatus/get/QueryParameters.java | 6 +++ .../petfindbytags/get/QueryParameters.java | 6 +++ .../petpetid/delete/HeaderParameters.java | 6 +++ .../paths/petpetid/delete/PathParameters.java | 6 +++ .../paths/petpetid/get/PathParameters.java | 6 +++ .../paths/petpetid/post/PathParameters.java | 6 +++ .../applicationxwwwformurlencoded/Schema.java | 6 +++ .../post/PathParameters.java | 6 +++ .../content/multipartformdata/Schema.java | 6 +++ .../delete/PathParameters.java | 6 +++ .../storeorderorderid/get/PathParameters.java | 6 +++ .../paths/userlogin/get/QueryParameters.java | 6 +++ .../get/responses/response200/Headers.java | 6 +++ .../userusername/delete/PathParameters.java | 6 +++ .../userusername/get/PathParameters.java | 6 +++ .../userusername/put/PathParameters.java | 6 +++ .../codegen/generators/DefaultGenerator.java | 9 ++-- .../generators/JavaClientGenerator.java | 1 + .../components/schemas/Schema_getSchemas.hbs | 2 +- .../components/schemas/_objectOutputType.hbs | 32 ++++++++++++++ 147 files changed, 994 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs 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 d258891039b..c4de4ac39d0 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeadersMap extends FrozenMap { + HeadersMap(FrozenMap m) { + super(m); + } + } + public class Headers1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 f17b9108e17..3ed565ccfce 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeadersMap extends FrozenMap { + HeadersMap(FrozenMap m) { + super(m); + } + } + public class Headers1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 a13ea71ca15..ee4cc0d41a1 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 @@ -14,6 +14,12 @@ public class Schema { public class AdditionalProperties extends Int32JsonSchema {} + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 dfe94829897..4593514908d 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 @@ -22,6 +22,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeadersMap extends FrozenMap { + HeadersMap(FrozenMap m) { + super(m); + } + } + public class Headers1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 f64d98f1408..4c5f1df5de3 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 @@ -16,6 +16,12 @@ public class AbstractStepMessage { public class Discriminator extends StringJsonSchema {} + class AbstractStepMessageMap extends FrozenMap { + AbstractStepMessageMap(FrozenMap m) { + super(m); + } + } + public class AbstractStepMessage1 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/AdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesClass.java index 37e3e592595..4da26556f15 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 @@ -19,6 +19,12 @@ public class AdditionalPropertiesClass { public class AdditionalProperties extends StringJsonSchema {} + class MapPropertyMap extends FrozenMap { + MapPropertyMap(FrozenMap m) { + super(m); + } + } + public class MapProperty implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -33,6 +39,12 @@ public static T validate(Map arg, SchemaCo public class AdditionalProperties2 extends StringJsonSchema {} + class AdditionalPropertiesMap extends FrozenMap { + AdditionalPropertiesMap(FrozenMap m) { + super(m); + } + } + public class AdditionalProperties1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -44,6 +56,12 @@ public static T validate(Map arg, SchemaCo } + class MapOfMapPropertyMap extends FrozenMap { + MapOfMapPropertyMap(FrozenMap m) { + super(m); + } + } + public class MapOfMapProperty implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -67,6 +85,12 @@ public class MapWithUndeclaredPropertiesAnytype2 extends MapJsonSchema {} public class AdditionalProperties3 extends AnyTypeJsonSchema {} + class MapWithUndeclaredPropertiesAnytype3Map extends FrozenMap { + MapWithUndeclaredPropertiesAnytype3Map(FrozenMap m) { + super(m); + } + } + public class MapWithUndeclaredPropertiesAnytype3 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -82,6 +106,13 @@ public class AdditionalProperties4 extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class EmptyMapMap extends FrozenMap { + EmptyMapMap(FrozenMap m) { + super(m); + } + // map with no key value pairs + } + public class EmptyMap implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -96,6 +127,12 @@ public static T validate(Map arg, SchemaCo public class AdditionalProperties5 extends StringJsonSchema {} + class MapWithUndeclaredPropertiesStringMap extends FrozenMap { + MapWithUndeclaredPropertiesStringMap(FrozenMap m) { + super(m); + } + } + public class MapWithUndeclaredPropertiesString implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -107,6 +144,12 @@ public static T validate(Map arg, SchemaCo } + class AdditionalPropertiesClassMap extends FrozenMap { + AdditionalPropertiesClassMap(FrozenMap m) { + super(m); + } + } + public class AdditionalPropertiesClass1 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/AdditionalPropertiesValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesValidator.java index b648297c8d0..0f60d27c7fc 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 @@ -19,6 +19,12 @@ public class AdditionalPropertiesValidator { public class AdditionalProperties extends AnyTypeJsonSchema {} + class Schema0Map extends FrozenMap { + Schema0Map(FrozenMap m) { + super(m); + } + } + public class Schema0 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -80,6 +86,12 @@ public static U validate(List arg, SchemaConfigur } } + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -141,6 +153,12 @@ public static U validate(List arg, SchemaConfigur } } + class Schema2Map extends FrozenMap { + Schema2Map(FrozenMap m) { + super(m); + } + } + public class Schema2 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 3467a75e2ae..6f5c2117725 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 @@ -22,6 +22,12 @@ public static U validate(List arg, SchemaConfigur } } + class AdditionalPropertiesWithArrayOfEnumsMap extends FrozenMap { + AdditionalPropertiesWithArrayOfEnumsMap(FrozenMap m) { + super(m); + } + } + public class AdditionalPropertiesWithArrayOfEnums1 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/Address.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Address.java index e222fe1a233..3d8ec1b8d4c 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 @@ -14,6 +14,12 @@ public class Address { public class AdditionalProperties extends IntJsonSchema {} + class AddressMap extends FrozenMap { + AddressMap(FrozenMap m) { + super(m); + } + } + public class Address1 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/Animal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Animal.java index 1a3835274bf..7c850523691 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 @@ -25,6 +25,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class AnimalMap extends FrozenMap { + AnimalMap(FrozenMap m) { + super(m); + } + } + public class Animal1 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/AnyTypeAndFormat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeAndFormat.java index 8c9a56b27fa..4211d5ad904 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 @@ -476,6 +476,12 @@ public static U validate(List arg, SchemaConfigur } } + class AnyTypeAndFormatMap extends FrozenMap { + AnyTypeAndFormatMap(FrozenMap m) { + super(m); + } + } + public class AnyTypeAndFormat1 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/ApiResponseSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ApiResponseSchema.java index f7306544b2b..e6422288a03 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 @@ -23,6 +23,12 @@ public class Type extends StringJsonSchema {} public class Message extends StringJsonSchema {} + class ApiResponseMap extends FrozenMap { + ApiResponseMap(FrozenMap m) { + super(m); + } + } + public class ApiResponseSchema1 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/Apple.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Apple.java index cd9c21f3df8..f85bc62a2a7 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 @@ -30,6 +30,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class AppleMap extends FrozenMap { + AppleMap(FrozenMap m) { + super(m); + } + } + public class Apple1 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/AppleReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AppleReq.java index d6e2da71e16..d693e617e97 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 @@ -26,6 +26,12 @@ public class Cultivar extends StringJsonSchema {} public class Mealy extends BooleanJsonSchema {} + class AppleReqMap extends FrozenMap { + AppleReqMap(FrozenMap m) { + super(m); + } + } + public class AppleReq1 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/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java index eedbb50c0d6..e947d0bbbab 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 @@ -38,6 +38,12 @@ public static U validate(List arg, SchemaConfigur } } + class ArrayOfArrayOfNumberOnlyMap extends FrozenMap { + ArrayOfArrayOfNumberOnlyMap(FrozenMap m) { + super(m); + } + } + public class ArrayOfArrayOfNumberOnly1 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/ArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfNumberOnly.java index e1235cb8247..dbccd799e15 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 @@ -28,6 +28,12 @@ public static U validate(List arg, SchemaConfigur } } + class ArrayOfNumberOnlyMap extends FrozenMap { + ArrayOfNumberOnlyMap(FrozenMap m) { + super(m); + } + } + public class ArrayOfNumberOnly1 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/ArrayTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayTest.java index ffe4cc391ca..c04dba6c6b9 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 @@ -72,6 +72,12 @@ public static U validate(List arg, SchemaConfigur } } + class ArrayTestMap extends FrozenMap { + ArrayTestMap(FrozenMap m) { + super(m); + } + } + public class ArrayTest1 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/Banana.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Banana.java index 6064e7e37a7..4f832be8bcb 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 @@ -16,6 +16,12 @@ public class Banana { public class LengthCm extends NumberJsonSchema {} + class BananaMap extends FrozenMap { + BananaMap(FrozenMap m) { + super(m); + } + } + public class Banana1 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/BananaReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BananaReq.java index 011893e5237..8afd03f5fd6 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 @@ -26,6 +26,12 @@ public class LengthCm extends NumberJsonSchema {} public class Sweet extends BooleanJsonSchema {} + class BananaReqMap extends FrozenMap { + BananaReqMap(FrozenMap m) { + super(m); + } + } + public class BananaReq1 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/BasquePig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BasquePig.java index 573505ec11e..25fc4e96f08 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 @@ -21,6 +21,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class BasquePigMap extends FrozenMap { + BasquePigMap(FrozenMap m) { + super(m); + } + } + public class BasquePig1 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/Capitalization.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java index c59d2cf4dec..f34d7b1f1ad 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 @@ -31,6 +31,12 @@ public class SCAETHFlowPoints extends StringJsonSchema {} public class ATTNAME extends StringJsonSchema {} + class CapitalizationMap extends FrozenMap { + CapitalizationMap(FrozenMap m) { + super(m); + } + } + public class Capitalization1 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/Cat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Cat.java index 6856411f153..31d9647f52b 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 @@ -21,6 +21,12 @@ public class Cat { public class Declawed extends BooleanJsonSchema {} + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 d5e75cf0b86..21223557163 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 @@ -25,6 +25,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class CategoryMap extends FrozenMap { + CategoryMap(FrozenMap m) { + super(m); + } + } + public class Category1 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/ChildCat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ChildCat.java index 217ff7a492f..2618c15db40 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 @@ -21,6 +21,12 @@ public class ChildCat { public class Name extends StringJsonSchema {} + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 35265a977a3..22dd9b6f943 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 @@ -19,6 +19,12 @@ public class ClassModel { public class ClassSchema extends StringJsonSchema {} + class ClassModelMap extends FrozenMap { + ClassModelMap(FrozenMap m) { + super(m); + } + } + public class ClassModel1 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/Client.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Client.java index 15bfeae2847..3be7ad47ef7 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 @@ -16,6 +16,12 @@ public class Client { public class Client2 extends StringJsonSchema {} + class ClientMap extends FrozenMap { + ClientMap(FrozenMap m) { + super(m); + } + } + public class Client1 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/ComplexQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComplexQuadrilateral.java index 8850c1ed454..e2d47160a7e 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 @@ -26,6 +26,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 f0a04ffc24a..12107e99653 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 @@ -21,6 +21,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class DanishPigMap extends FrozenMap { + DanishPigMap(FrozenMap m) { + super(m); + } + } + public class DanishPig1 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/Dog.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java index 54023ef9c9e..bba129c5b48 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 @@ -21,6 +21,12 @@ public class Dog { public class Breed extends StringJsonSchema {} + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 8c81bad4408..4daf7ffaba4 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 @@ -24,6 +24,12 @@ public static U validate(List arg, SchemaConfigur } } + class DrawingMap extends FrozenMap { + DrawingMap(FrozenMap m) { + super(m); + } + } + public class Drawing1 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/EnumArrays.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumArrays.java index 3f71c9743bb..1e6c9fcde1b 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 @@ -42,6 +42,12 @@ public static U validate(List arg, SchemaConfigur } } + class EnumArraysMap extends FrozenMap { + EnumArraysMap(FrozenMap m) { + super(m); + } + } + public class EnumArrays1 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/EnumTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EnumTest.java index 48648244be0..c95512e52d4 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 @@ -68,6 +68,12 @@ public static Double validate(Double arg, SchemaConfiguration configuration) { } } + class EnumTestMap extends FrozenMap { + EnumTestMap(FrozenMap m) { + super(m); + } + } + public class EnumTest1 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/EquilateralTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EquilateralTriangle.java index fc304ea9f73..88c3fdb9ac1 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 @@ -26,6 +26,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 4d36a631484..fd496710326 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 @@ -16,6 +16,12 @@ public class File { public class SourceURI extends StringJsonSchema {} + class FileMap extends FrozenMap { + FileMap(FrozenMap m) { + super(m); + } + } + public class File1 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/FileSchemaTestClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FileSchemaTestClass.java index 65a0de5fedd..19f0fdd5160 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 @@ -24,6 +24,12 @@ public static U validate(List arg, SchemaConfigur } } + class FileSchemaTestClassMap extends FrozenMap { + FileSchemaTestClassMap(FrozenMap m) { + super(m); + } + } + public class FileSchemaTestClass1 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/Foo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Foo.java index b15bfec449a..cf15c409432 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 @@ -12,6 +12,12 @@ public class Foo { // nest classes so all schemas and input/output classes can be public + class FooMap extends FrozenMap { + FooMap(FrozenMap m) { + super(m); + } + } + public class Foo1 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/FormatTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FormatTest.java index a8b8116c3b9..a587831535d 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 @@ -208,6 +208,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class NoneProp extends NullJsonSchema {} + class FormatTestMap extends FrozenMap { + FormatTestMap(FrozenMap m) { + super(m); + } + } + public class FormatTest1 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/FromSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FromSchema.java index 603fbd4e715..9527113ad4f 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 @@ -20,6 +20,12 @@ public class Data extends StringJsonSchema {} public class Id extends IntJsonSchema {} + class FromSchemaMap extends FrozenMap { + FromSchemaMap(FrozenMap m) { + super(m); + } + } + public class FromSchema1 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/Fruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Fruit.java index 5de08421f38..32b57af2784 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 @@ -19,6 +19,12 @@ public class Fruit { public class Color extends StringJsonSchema {} + class FruitMap extends FrozenMap { + FruitMap(FrozenMap m) { + super(m); + } + } + public class Fruit1 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/GmFruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GmFruit.java index c9fe93630a0..0610ac57551 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 @@ -19,6 +19,12 @@ public class GmFruit { public class Color extends StringJsonSchema {} + class GmFruitMap extends FrozenMap { + GmFruitMap(FrozenMap m) { + super(m); + } + } + public class GmFruit1 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/GrandparentAnimal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GrandparentAnimal.java index 14e1deca98d..d936d09157d 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 @@ -16,6 +16,12 @@ public class GrandparentAnimal { public class PetType extends StringJsonSchema {} + class GrandparentAnimalMap extends FrozenMap { + GrandparentAnimalMap(FrozenMap m) { + super(m); + } + } + public class GrandparentAnimal1 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/HasOnlyReadOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HasOnlyReadOnly.java index bcfc46979a6..ecd7cbc6077 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 @@ -19,6 +19,12 @@ public class Bar extends StringJsonSchema {} public class Foo extends StringJsonSchema {} + class HasOnlyReadOnlyMap extends FrozenMap { + HasOnlyReadOnlyMap(FrozenMap m) { + super(m); + } + } + public class HasOnlyReadOnly1 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/HealthCheckResult.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HealthCheckResult.java index 5cb6d362943..05915a0db6d 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 @@ -25,6 +25,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class HealthCheckResultMap extends FrozenMap { + HealthCheckResultMap(FrozenMap m) { + super(m); + } + } + public class HealthCheckResult1 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/IsoscelesTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/IsoscelesTriangle.java index 6e3e998d223..74959bdf427 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 @@ -26,6 +26,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 6df66328776..935e6f19545 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 @@ -34,6 +34,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class JSONPatchRequestAddReplaceTestMap extends FrozenMap { + JSONPatchRequestAddReplaceTestMap(FrozenMap m) { + super(m); + } + } + public class JSONPatchRequestAddReplaceTest1 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/JSONPatchRequestMoveCopy.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestMoveCopy.java index 40cbda6b2c3..e143db789d8 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 @@ -34,6 +34,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class JSONPatchRequestMoveCopyMap extends FrozenMap { + JSONPatchRequestMoveCopyMap(FrozenMap m) { + super(m); + } + } + public class JSONPatchRequestMoveCopy1 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/JSONPatchRequestRemove.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestRemove.java index a2b18af2168..59f0c49966e 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 @@ -31,6 +31,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class JSONPatchRequestRemoveMap extends FrozenMap { + JSONPatchRequestRemoveMap(FrozenMap m) { + super(m); + } + } + public class JSONPatchRequestRemove1 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/MapTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java index bb3bb1627b9..96d562abb81 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 @@ -17,6 +17,12 @@ public class MapTest { public class AdditionalProperties1 extends StringJsonSchema {} + class AdditionalPropertiesMap extends FrozenMap { + AdditionalPropertiesMap(FrozenMap m) { + super(m); + } + } + public class AdditionalProperties implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -28,6 +34,12 @@ public static T validate(Map arg, SchemaCo } + class MapMapOfStringMap extends FrozenMap { + MapMapOfStringMap(FrozenMap m) { + super(m); + } + } + public class MapMapOfString implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -48,6 +60,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class MapOfEnumStringMap extends FrozenMap { + MapOfEnumStringMap(FrozenMap m) { + super(m); + } + } + public class MapOfEnumString implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -62,6 +80,12 @@ public static T validate(Map arg, SchemaCo public class AdditionalProperties3 extends BooleanJsonSchema {} + class DirectMapMap extends FrozenMap { + DirectMapMap(FrozenMap m) { + super(m); + } + } + public class DirectMap implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -73,6 +97,12 @@ public static T validate(Map arg, SchemaCo } + class MapTestMap extends FrozenMap { + MapTestMap(FrozenMap m) { + super(m); + } + } + public class MapTest1 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/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java index adf7cc3eef8..16790c8d3b4 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 @@ -20,6 +20,12 @@ public class UuidSchema extends UuidJsonSchema {} public class DateTime extends DateTimeJsonSchema {} + class MapMap extends FrozenMap { + MapMap(FrozenMap m) { + super(m); + } + } + public class MapSchema implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -31,6 +37,12 @@ public static T validate(Map arg, SchemaCo } + class MixedPropertiesAndAdditionalPropertiesClassMap extends FrozenMap { + MixedPropertiesAndAdditionalPropertiesClassMap(FrozenMap m) { + super(m); + } + } + public class MixedPropertiesAndAdditionalPropertiesClass1 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/Money.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Money.java index 6a02b403685..a43ef92359d 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 @@ -22,6 +22,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} public class Amount extends DecimalJsonSchema {} + class MoneyMap extends FrozenMap { + MoneyMap(FrozenMap m) { + super(m); + } + } + public class Money1 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/MyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MyObjectDto.java index 4498883dae7..8f6729ced19 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 @@ -22,6 +22,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} public class Id extends UuidJsonSchema {} + class MyObjectDtoMap extends FrozenMap { + MyObjectDtoMap(FrozenMap m) { + super(m); + } + } + public class MyObjectDto1 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/Name.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Name.java index a30306f0f39..3dfc3c8fe21 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 @@ -28,6 +28,12 @@ public class SnakeCase extends Int32JsonSchema {} public class Property extends StringJsonSchema {} + class NameMap extends FrozenMap { + NameMap(FrozenMap m) { + super(m); + } + } + public class Name1 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/NoAdditionalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NoAdditionalProperties.java index 329af335ce6..4cae89afd6f 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 @@ -25,6 +25,12 @@ public class Id extends Int64JsonSchema {} public class PetId extends Int64JsonSchema {} + class NoAdditionalPropertiesMap extends FrozenMap { + NoAdditionalPropertiesMap(FrozenMap m) { + super(m); + } + } + public class NoAdditionalProperties1 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/NullableClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableClass.java index 924dd8fa7b2..2dcce39bfad 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 @@ -210,6 +210,12 @@ public static U validate(List arg, SchemaConfigur public class AdditionalProperties extends MapJsonSchema {} + class ObjectNullablePropMap extends FrozenMap { + ObjectNullablePropMap(FrozenMap m) { + super(m); + } + } + public class ObjectNullableProp implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, @@ -237,6 +243,12 @@ public static T validate(Map arg, SchemaCo } } + class ObjectAndItemsNullablePropMap extends FrozenMap { + ObjectAndItemsNullablePropMap(FrozenMap m) { + super(m); + } + } + public class ObjectAndItemsNullableProp implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, @@ -264,6 +276,12 @@ public static T validate(Map arg, SchemaCo } } + class ObjectItemsNullableMap extends FrozenMap { + ObjectItemsNullableMap(FrozenMap m) { + super(m); + } + } + public class ObjectItemsNullable implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class @@ -275,6 +293,12 @@ public static T validate(Map arg, SchemaCo } + class NullableClassMap extends FrozenMap { + NullableClassMap(FrozenMap m) { + super(m); + } + } + public class NullableClass1 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/NumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberOnly.java index 101ae9d01b1..af70645c71f 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 @@ -16,6 +16,12 @@ public class NumberOnly { public class JustNumber extends NumberJsonSchema {} + class NumberOnlyMap extends FrozenMap { + NumberOnlyMap(FrozenMap m) { + super(m); + } + } + public class NumberOnly1 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/ObjWithRequiredProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredProps.java index ea16ff3fc2b..dd7ab069769 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 @@ -16,6 +16,12 @@ public class ObjWithRequiredProps { public class A extends StringJsonSchema {} + class ObjWithRequiredPropsMap extends FrozenMap { + ObjWithRequiredPropsMap(FrozenMap m) { + super(m); + } + } + public class ObjWithRequiredProps1 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/ObjWithRequiredPropsBase.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredPropsBase.java index 78a1efc8162..3cac8085502 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 @@ -16,6 +16,12 @@ public class ObjWithRequiredPropsBase { public class B extends StringJsonSchema {} + class ObjWithRequiredPropsBaseMap extends FrozenMap { + ObjWithRequiredPropsBaseMap(FrozenMap m) { + super(m); + } + } + public class ObjWithRequiredPropsBase1 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/ObjectModelWithArgAndArgsProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java index 1f708ef7f00..37240ed0640 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 @@ -19,6 +19,12 @@ public class Arg extends StringJsonSchema {} public class Args extends StringJsonSchema {} + class ObjectModelWithArgAndArgsPropertiesMap extends FrozenMap { + ObjectModelWithArgAndArgsPropertiesMap(FrozenMap m) { + super(m); + } + } + public class ObjectModelWithArgAndArgsProperties1 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/ObjectModelWithRefProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithRefProps.java index af84b7940c5..f1b1c7ae76b 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 @@ -12,6 +12,12 @@ public class ObjectModelWithRefProps { // nest classes so all schemas and input/output classes can be public + class ObjectModelWithRefPropsMap extends FrozenMap { + ObjectModelWithRefPropsMap(FrozenMap m) { + super(m); + } + } + public class ObjectModelWithRefProps1 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/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java index cab27320471..d0c5101e7c4 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 @@ -21,6 +21,12 @@ public class ObjectWithAllOfWithReqTestPropFromUnsetAddProp { public class Name extends StringJsonSchema {} + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 922c4df4091..153bd0aab90 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 @@ -19,6 +19,12 @@ public class SomeProp extends MapJsonSchema {} public class Someprop extends MapJsonSchema {} + class ObjectWithCollidingPropertiesMap extends FrozenMap { + ObjectWithCollidingPropertiesMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithCollidingProperties1 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/ObjectWithDecimalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDecimalProperties.java index 9a93356bc88..86b00b4154a 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 @@ -16,6 +16,12 @@ public class ObjectWithDecimalProperties { public class Width extends DecimalJsonSchema {} + class ObjectWithDecimalPropertiesMap extends FrozenMap { + ObjectWithDecimalPropertiesMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithDecimalProperties1 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/ObjectWithDifficultlyNamedProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDifficultlyNamedProps.java index 96e5065218b..84407d8c506 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 @@ -24,6 +24,12 @@ public class Schema123list extends StringJsonSchema {} public class Schema123Number extends IntJsonSchema {} + class ObjectWithDifficultlyNamedPropsMap extends FrozenMap { + ObjectWithDifficultlyNamedPropsMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithDifficultlyNamedProps1 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/ObjectWithInlineCompositionProperty.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInlineCompositionProperty.java index 836e38a2a6b..6b7208ccf99 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 @@ -76,6 +76,12 @@ public static U validate(List arg, SchemaConfigur } } + class ObjectWithInlineCompositionPropertyMap extends FrozenMap { + ObjectWithInlineCompositionPropertyMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithInlineCompositionProperty1 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/ObjectWithInvalidNamedRefedProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInvalidNamedRefedProperties.java index a13163684f6..3db702cc481 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 @@ -12,6 +12,12 @@ public class ObjectWithInvalidNamedRefedProperties { // nest classes so all schemas and input/output classes can be public + class ObjectWithInvalidNamedRefedPropertiesMap extends FrozenMap { + ObjectWithInvalidNamedRefedPropertiesMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithInvalidNamedRefedProperties1 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/ObjectWithNonIntersectingValues.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithNonIntersectingValues.java index b1570b23182..20230d536a7 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 @@ -20,6 +20,12 @@ public class AdditionalProperties extends StringJsonSchema {} public class A extends NumberJsonSchema {} + class ObjectWithNonIntersectingValuesMap extends FrozenMap { + ObjectWithNonIntersectingValuesMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithNonIntersectingValues1 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/ObjectWithOnlyOptionalProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOnlyOptionalProps.java index 40c4a10a69f..11c83c36546 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 @@ -26,6 +26,12 @@ public class A extends StringJsonSchema {} public class B extends NumberJsonSchema {} + class ObjectWithOnlyOptionalPropsMap extends FrozenMap { + ObjectWithOnlyOptionalPropsMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithOnlyOptionalProps1 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/ObjectWithOptionalTestProp.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOptionalTestProp.java index d032568e2dc..f0d80d54acc 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 @@ -16,6 +16,12 @@ public class ObjectWithOptionalTestProp { public class Test extends StringJsonSchema {} + class ObjectWithOptionalTestPropMap extends FrozenMap { + ObjectWithOptionalTestPropMap(FrozenMap m) { + super(m); + } + } + public class ObjectWithOptionalTestProp1 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/Order.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Order.java index 41ca6803481..b73d7e86d1c 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 @@ -40,6 +40,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class Complete extends BooleanJsonSchema {} + class OrderMap extends FrozenMap { + OrderMap(FrozenMap m) { + super(m); + } + } + public class Order1 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/PaginatedResultMyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PaginatedResultMyObjectDto.java index 6707fa00ae7..6b9b74fe38a 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 @@ -34,6 +34,12 @@ public static U validate(List arg, SchemaConfigur } } + class PaginatedResultMyObjectDtoMap extends FrozenMap { + PaginatedResultMyObjectDtoMap(FrozenMap m) { + super(m); + } + } + public class PaginatedResultMyObjectDto1 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/Pet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pet.java index fc99725ce02..796113c245f 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 @@ -54,6 +54,12 @@ public static U validate(List arg, SchemaConfigur } } + class PetMap extends FrozenMap { + PetMap(FrozenMap m) { + super(m); + } + } + public class Pet1 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/Player.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java index 3830a6aee00..5a5150dc68a 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 @@ -16,6 +16,12 @@ public class Player { public class Name extends StringJsonSchema {} + class PlayerMap extends FrozenMap { + PlayerMap(FrozenMap m) { + super(m); + } + } + public class Player1 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/PublicKey.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PublicKey.java index 45aad4b518b..3509182823a 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 @@ -16,6 +16,12 @@ public class PublicKey { public class Key extends StringJsonSchema {} + class PublicKeyMap extends FrozenMap { + PublicKeyMap(FrozenMap m) { + super(m); + } + } + public class PublicKey1 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/QuadrilateralInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/QuadrilateralInterface.java index b8b2a1de0fc..87f16c6e0fb 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 @@ -30,6 +30,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class QuadrilateralType extends StringJsonSchema {} + class QuadrilateralInterfaceMap extends FrozenMap { + QuadrilateralInterfaceMap(FrozenMap m) { + super(m); + } + } + public class QuadrilateralInterface1 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/ReadOnlyFirst.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReadOnlyFirst.java index 050f1e685bb..dd238f8e253 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 @@ -19,6 +19,12 @@ public class Bar extends StringJsonSchema {} public class Baz extends StringJsonSchema {} + class ReadOnlyFirstMap extends FrozenMap { + ReadOnlyFirstMap(FrozenMap m) { + super(m); + } + } + public class ReadOnlyFirst1 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/ReqPropsFromExplicitAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromExplicitAddProps.java index 8dad7033375..7063b7c6867 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 @@ -14,6 +14,12 @@ public class ReqPropsFromExplicitAddProps { public class AdditionalProperties extends StringJsonSchema {} + class ReqPropsFromExplicitAddPropsMap extends FrozenMap { + ReqPropsFromExplicitAddPropsMap(FrozenMap m) { + super(m); + } + } + public class ReqPropsFromExplicitAddProps1 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/ReqPropsFromTrueAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromTrueAddProps.java index 921c82a5be6..b79a8a416c4 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 @@ -14,6 +14,12 @@ public class ReqPropsFromTrueAddProps { public class AdditionalProperties extends AnyTypeJsonSchema {} + class ReqPropsFromTrueAddPropsMap extends FrozenMap { + ReqPropsFromTrueAddPropsMap(FrozenMap m) { + super(m); + } + } + public class ReqPropsFromTrueAddProps1 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/ReqPropsFromUnsetAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromUnsetAddProps.java index 42c0aa53154..6a17bf539e4 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 @@ -10,6 +10,12 @@ public class ReqPropsFromUnsetAddProps { // nest classes so all schemas and input/output classes can be public + class ReqPropsFromUnsetAddPropsMap extends FrozenMap { + ReqPropsFromUnsetAddPropsMap(FrozenMap m) { + super(m); + } + } + public class ReqPropsFromUnsetAddProps1 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/ReturnSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReturnSchema.java index a0912189294..9447f2f20e0 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 @@ -19,6 +19,12 @@ public class ReturnSchema { public class ReturnSchema2 extends Int32JsonSchema {} + class ReturnMap extends FrozenMap { + ReturnMap(FrozenMap m) { + super(m); + } + } + public class ReturnSchema1 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/ScaleneTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java index 0987d7604b5..5ac861489ec 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 @@ -26,6 +26,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 df2247d1728..f95742a16c2 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 @@ -23,6 +23,12 @@ public class Name extends Int32JsonSchema {} public class ClassSchema extends StringJsonSchema {} + class Schema200ResponseMap extends FrozenMap { + Schema200ResponseMap(FrozenMap m) { + super(m); + } + } + public class Schema200Response1 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/SelfReferencingObjectModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingObjectModel.java index f5804ec4d08..a0ad0e0dc04 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 @@ -12,6 +12,12 @@ public class SelfReferencingObjectModel { // nest classes so all schemas and input/output classes can be public + class SelfReferencingObjectModelMap extends FrozenMap { + SelfReferencingObjectModelMap(FrozenMap m) { + super(m); + } + } + public class SelfReferencingObjectModel1 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/SimpleQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SimpleQuadrilateral.java index c1fbcbe4ece..0a73a8d3f4e 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 @@ -26,6 +26,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class Schema1Map extends FrozenMap { + Schema1Map(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 f9aa67839c7..ad988b615c2 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 @@ -16,6 +16,12 @@ public class SpecialModelname { public class A extends StringJsonSchema {} + class SpecialModelnameMap extends FrozenMap { + SpecialModelnameMap(FrozenMap m) { + super(m); + } + } + public class SpecialModelname1 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/StringBooleanMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringBooleanMap.java index 982962912ad..a1391269bfe 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 @@ -14,6 +14,12 @@ public class StringBooleanMap { public class AdditionalProperties extends BooleanJsonSchema {} + class StringBooleanMapMap extends FrozenMap { + StringBooleanMapMap(FrozenMap m) { + super(m); + } + } + public class StringBooleanMap1 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/Tag.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Tag.java index 5afa078ae5b..6d31b1d4d13 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 @@ -20,6 +20,12 @@ public class Id extends Int64JsonSchema {} public class Name extends StringJsonSchema {} + class TagMap extends FrozenMap { + TagMap(FrozenMap m) { + super(m); + } + } + public class Tag1 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/TriangleInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/TriangleInterface.java index d082ed84d95..d65e93f30fb 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 @@ -30,6 +30,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class TriangleType extends StringJsonSchema {} + class TriangleInterfaceMap extends FrozenMap { + TriangleInterfaceMap(FrozenMap m) { + super(m); + } + } + public class TriangleInterface1 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/User.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/User.java index 6bb8d313698..940809ae9f5 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 @@ -122,6 +122,12 @@ public static U validate(List arg, SchemaConfigur public class AnyTypePropNullable extends AnyTypeJsonSchema {} + class UserMap extends FrozenMap { + UserMap(FrozenMap m) { + super(m); + } + } + 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 a24d2481a7c..15960964451 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 @@ -28,6 +28,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class WhaleMap extends FrozenMap { + WhaleMap(FrozenMap m) { + super(m); + } + } + public class Whale1 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/Zebra.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Zebra.java index 04bac616609..4538e7dda4c 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 @@ -34,6 +34,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class ZebraMap extends FrozenMap { + ZebraMap(FrozenMap m) { + super(m); + } + } + public class Zebra1 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/paths/commonparamsubdir/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java index 0de422a5941..b7f95648f8a 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeaderParametersMap extends FrozenMap { + HeaderParametersMap(FrozenMap m) { + super(m); + } + } + public class HeaderParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 a3bb2161aee..5d6e4029a75 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 bcb146e36f7..d8b2d56569e 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 e2a1c6e7fa1..fa1b6a57011 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 39a2db11ccb..f083ba67257 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeaderParametersMap extends FrozenMap { + HeaderParametersMap(FrozenMap m) { + super(m); + } + } + public class HeaderParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 a3d81459bc7..d57696a4199 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 c617df271e0..45686f9de2e 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 @@ -20,6 +20,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeaderParametersMap extends FrozenMap { + HeaderParametersMap(FrozenMap m) { + super(m); + } + } + public class HeaderParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 d8a7caa18e0..bc337978433 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 @@ -22,6 +22,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 db4641974ec..b6fd97bc0e7 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 @@ -20,6 +20,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeaderParametersMap extends FrozenMap { + HeaderParametersMap(FrozenMap m) { + super(m); + } + } + public class HeaderParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 1a4cfc7c570..251a319d549 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 @@ -22,6 +22,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 fce142ca4c3..9ef743881e0 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 @@ -42,6 +42,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 8b1e377e3f0..98f2494ae44 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 @@ -170,6 +170,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class Callback extends StringJsonSchema {} + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 6a5970cbaf1..da8b6f23212 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 d42dd9f5e7c..673656ff526 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 @@ -21,6 +21,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 636061a20ad..6afa73b144f 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 bb5f11f518f..2b5ce6f642f 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 @@ -14,6 +14,12 @@ public class Schema { public class AdditionalProperties extends StringJsonSchema {} + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 2a37f013324..c90996d2a2f 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 @@ -20,6 +20,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 4b78f8e42be..8d9a9d620a5 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 @@ -76,6 +76,12 @@ public static U validate(List arg, SchemaConfigur } } + class SchemaMap1 extends FrozenMap { + SchemaMap1(FrozenMap m) { + super(m); + } + } + public class Schema11 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 3de93bbf15d..ec1388bf521 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 @@ -76,6 +76,12 @@ public static U validate(List arg, SchemaConfigur } } + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 c92f0a34232..2021b7b8163 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 @@ -76,6 +76,12 @@ public static U validate(List arg, SchemaConfigur } } + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 064b715d892..9f6ede194e9 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 @@ -19,6 +19,12 @@ public class Param extends StringJsonSchema {} public class Param2 extends StringJsonSchema {} + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 a561f7b5019..f840bf8ab70 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 @@ -16,6 +16,12 @@ public class Schema { public class A extends StringJsonSchema {} + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 d3e8be6eb24..c70fc2d602a 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 @@ -16,6 +16,12 @@ public class Schema { public class B extends StringJsonSchema {} + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 ead2819509e..cdfe50fabd8 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 3b1d220b1eb..0096ad64c88 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 @@ -16,6 +16,12 @@ public class Schema0 { public class Keyword0 extends StringJsonSchema {} + class SchemaMap0 extends FrozenMap { + SchemaMap0(FrozenMap m) { + super(m); + } + } + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 f4ecf2a03ab..9a6eae66c91 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 @@ -23,6 +23,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class CookieParametersMap extends FrozenMap { + CookieParametersMap(FrozenMap m) { + super(m); + } + } + public class CookieParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 f809d0b1725..1e020d60bbb 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 @@ -22,6 +22,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeaderParametersMap extends FrozenMap { + HeaderParametersMap(FrozenMap m) { + super(m); + } + } + public class HeaderParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 e6885b3eb79..bca23ce0207 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 @@ -23,6 +23,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 1c106105153..75affb668d7 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 @@ -23,6 +23,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 cc94f8727ed..7b281b1371a 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 45a3b1e1b82..72675a8c05a 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 @@ -21,6 +21,12 @@ public class RequiredFile implements JsonSchema { } + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 6f1a212309d..3ade7185de6 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 1bdd3fcc021..3104437de25 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 228fad9536a..6d076571736 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 @@ -24,6 +24,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 7229dcba718..92d1a5efcff 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 @@ -21,6 +21,12 @@ public class File implements JsonSchema { } + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 9052d4978a5..702ac89c7b0 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 @@ -29,6 +29,12 @@ public static U validate(List arg, SchemaConfigur } } + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 9a6907b020b..1a5adc1f10f 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 @@ -13,6 +13,12 @@ public class Schema { // nest classes so all schemas and input/output classes can be public + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 c0c5a38019e..efd5d59bfd2 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 485626dea92..90926c57da2 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 e2696fec901..504e2d4cf6f 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeaderParametersMap extends FrozenMap { + HeaderParametersMap(FrozenMap m) { + super(m); + } + } + public class HeaderParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 2e6ff1a3ab9..0207168fa00 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 f9152ac557b..e4986abf8c5 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 9d6aacb1d64..d97edaaaede 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 74c47e97c77..0da278221f0 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 @@ -19,6 +19,12 @@ public class Name extends StringJsonSchema {} public class Status extends StringJsonSchema {} + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 c14c8f523a5..3626f352f76 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 383f0c74cc5..946320c3fd7 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 @@ -21,6 +21,12 @@ public class File implements JsonSchema { } + class SchemaMap extends FrozenMap { + SchemaMap(FrozenMap m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 0ca85011729..36efb1519ee 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 2dbbc3664b4..043e45de2ac 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 7783426a47f..dfeda2518f6 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 @@ -20,6 +20,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class QueryParametersMap extends FrozenMap { + QueryParametersMap(FrozenMap m) { + super(m); + } + } + public class QueryParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 8383ed5411e..d590bc0cdff 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 @@ -23,6 +23,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class HeadersMap extends FrozenMap { + HeadersMap(FrozenMap m) { + super(m); + } + } + public class Headers1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 1696bb6077d..4250469beaf 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 a9ed723e411..b0df1c5c7cd 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class 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 95f7a900260..479c935772f 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 @@ -19,6 +19,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema + class PathParametersMap extends FrozenMap { + PathParametersMap(FrozenMap m) { + super(m); + } + } + public class PathParameters1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index d6ce79d76b8..e4a3239a428 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -348,6 +348,7 @@ public class DefaultGenerator implements Generator { // from deeper schema defined locations protected boolean addSchemaImportsFromV3SpecLocations = false; protected boolean deepestRefSchemaImportNeeded = false; + protected String objectIOClassNamePiece = "Dict"; @Override public List cliOptions() { @@ -2424,23 +2425,23 @@ public CodegenSchema fromSchema(Schema p, String sourceJsonPath, String currentJ property.mapInputJsonPathPiece = getKey(currentName + "DictInput", "schemaProperty", sourceJsonPath); // even though the definition is the same, mapOutputJsonPathPiece needs to be different // so an implementing class can be written - property.mapOutputJsonPathPiece = getKey(currentName + "Dict", "schemaProperty", sourceJsonPath); + property.mapOutputJsonPathPiece = getKey(currentName + objectIOClassNamePiece, "schemaProperty", sourceJsonPath); } break; case "11": // optional + required property.mapInputJsonPathPiece = getKey(currentName + "DictInput", "schemaProperty", sourceJsonPath); - property.mapOutputJsonPathPiece = getKey(currentName + "Dict", "schemaProperty", sourceJsonPath); + property.mapOutputJsonPathPiece = getKey(currentName + objectIOClassNamePiece, "schemaProperty", sourceJsonPath); break; case "10": // only required property.mapInputJsonPathPiece = property.requiredProperties.jsonPathPiece(); - property.mapOutputJsonPathPiece = getKey(currentName + "Dict", "schemaProperty", sourceJsonPath); + property.mapOutputJsonPathPiece = getKey(currentName + objectIOClassNamePiece, "schemaProperty", sourceJsonPath); break; case "01": // only optional property.mapInputJsonPathPiece = property.optionalProperties.jsonPathPiece(); - property.mapOutputJsonPathPiece = getKey(currentName + "Dict", "schemaProperty", sourceJsonPath); + property.mapOutputJsonPathPiece = getKey(currentName + objectIOClassNamePiece, "schemaProperty", sourceJsonPath); break; } } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index f5d1c1efb84..709766beded 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -178,6 +178,7 @@ public JavaClientGenerator() { // if another schema $refs a schema in a parameter, the json path // and generated module must have the same parameter index as the spec sortParamsByRequiredFlag = Boolean.FALSE; + objectIOClassNamePiece = "Map"; // TODO: Move GlobalFeature.ParameterizedServer to library: jersey after moving featureSet to generatorMetadata diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs index 82962a0748a..928398cefba 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs @@ -28,7 +28,7 @@ {{!> components/schemas/_object_input_type }} {{else}} {{#eq instanceType "propertiesOutputType" }} -{{!> components/schemas/_object_output_type }} +{{> src/main/java/org/openapitools/components/schemas/_objectOutputType }} {{else}} {{#eq instanceType "arrayOutputType" }} {{!> components/schemas/_array_output_type }} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs new file mode 100644 index 00000000000..d99d18e8f85 --- /dev/null +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs @@ -0,0 +1,32 @@ + + +{{#if mapValueSchema}} + {{#if mapValueSchema.refInfo.refClass}} +class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap components/schemas/types/schema_output_type mode="unprefixed" fullRefModule="" endChar="]):" }}{{/with}}Object> { + {{mapOutputJsonPathPiece.camelCase}}(FrozenMap m) { + super(m); + } + {{else}} +class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap components/schemas/types/schema_output_type mode="unprefixed" fullRefModule=null endChar="]):" }}{{/with}}Object> { + {{mapOutputJsonPathPiece.camelCase}}(FrozenMap m) { + super(m); + } + {{/if}} +{{else}} +class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap { + {{mapOutputJsonPathPiece.camelCase}}(FrozenMap m) { + super(m); + } +{{/if}} + {{#eq optionalProperties null}} + {{#eq requiredProperties null}} + {{#if additionalProperties}} + {{#if additionalProperties.isBooleanSchemaFalse}} + // map with no key value pairs + {{/if}} + {{/if}} + {{/eq}} + {{/eq}} + {{!> components/schemas/__new__ }} + {{!> components/schemas/_object_output_properties }} +} \ No newline at end of file From 86d3e8a8d65be8fff7520dbb0a26a7573becfbc3 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sat, 18 Nov 2023 18:05:12 -0800 Subject: [PATCH 02/15] Adds map output class of method --- .../responses/headerswithnobody/Headers.java | 3 +++ .../Headers.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../successwithjsonapiresponse/Headers.java | 3 +++ .../schemas/AbstractStepMessage.java | 3 +++ .../schemas/AdditionalPropertiesClass.java | 21 +++++++++++++++++++ .../AdditionalPropertiesValidator.java | 9 ++++++++ .../AdditionalPropertiesWithArrayOfEnums.java | 3 +++ .../components/schemas/Address.java | 3 +++ .../components/schemas/Animal.java | 3 +++ .../components/schemas/AnyTypeAndFormat.java | 3 +++ .../components/schemas/ApiResponseSchema.java | 3 +++ .../components/schemas/Apple.java | 3 +++ .../components/schemas/AppleReq.java | 3 +++ .../schemas/ArrayOfArrayOfNumberOnly.java | 3 +++ .../components/schemas/ArrayOfNumberOnly.java | 3 +++ .../components/schemas/ArrayTest.java | 3 +++ .../components/schemas/Banana.java | 3 +++ .../components/schemas/BananaReq.java | 3 +++ .../components/schemas/BasquePig.java | 3 +++ .../components/schemas/Capitalization.java | 3 +++ .../components/schemas/Cat.java | 3 +++ .../components/schemas/Category.java | 3 +++ .../components/schemas/ChildCat.java | 3 +++ .../components/schemas/ClassModel.java | 3 +++ .../components/schemas/Client.java | 3 +++ .../schemas/ComplexQuadrilateral.java | 3 +++ .../components/schemas/DanishPig.java | 3 +++ .../components/schemas/Dog.java | 3 +++ .../components/schemas/Drawing.java | 3 +++ .../components/schemas/EnumArrays.java | 3 +++ .../components/schemas/EnumTest.java | 3 +++ .../schemas/EquilateralTriangle.java | 3 +++ .../components/schemas/File.java | 3 +++ .../schemas/FileSchemaTestClass.java | 3 +++ .../components/schemas/Foo.java | 3 +++ .../components/schemas/FormatTest.java | 3 +++ .../components/schemas/FromSchema.java | 3 +++ .../components/schemas/Fruit.java | 3 +++ .../components/schemas/GmFruit.java | 3 +++ .../components/schemas/GrandparentAnimal.java | 3 +++ .../components/schemas/HasOnlyReadOnly.java | 3 +++ .../components/schemas/HealthCheckResult.java | 3 +++ .../components/schemas/IsoscelesTriangle.java | 3 +++ .../JSONPatchRequestAddReplaceTest.java | 3 +++ .../schemas/JSONPatchRequestMoveCopy.java | 3 +++ .../schemas/JSONPatchRequestRemove.java | 3 +++ .../components/schemas/MapTest.java | 15 +++++++++++++ ...ropertiesAndAdditionalPropertiesClass.java | 6 ++++++ .../components/schemas/Money.java | 3 +++ .../components/schemas/MyObjectDto.java | 3 +++ .../components/schemas/Name.java | 3 +++ .../schemas/NoAdditionalProperties.java | 3 +++ .../components/schemas/NullableClass.java | 12 +++++++++++ .../components/schemas/NumberOnly.java | 3 +++ .../schemas/ObjWithRequiredProps.java | 3 +++ .../schemas/ObjWithRequiredPropsBase.java | 3 +++ .../ObjectModelWithArgAndArgsProperties.java | 3 +++ .../schemas/ObjectModelWithRefProps.java | 3 +++ ...hAllOfWithReqTestPropFromUnsetAddProp.java | 3 +++ .../ObjectWithCollidingProperties.java | 3 +++ .../schemas/ObjectWithDecimalProperties.java | 3 +++ .../ObjectWithDifficultlyNamedProps.java | 3 +++ .../ObjectWithInlineCompositionProperty.java | 3 +++ ...ObjectWithInvalidNamedRefedProperties.java | 3 +++ .../ObjectWithNonIntersectingValues.java | 3 +++ .../schemas/ObjectWithOnlyOptionalProps.java | 3 +++ .../schemas/ObjectWithOptionalTestProp.java | 3 +++ .../components/schemas/Order.java | 3 +++ .../schemas/PaginatedResultMyObjectDto.java | 3 +++ .../components/schemas/Pet.java | 3 +++ .../components/schemas/Player.java | 3 +++ .../components/schemas/PublicKey.java | 3 +++ .../schemas/QuadrilateralInterface.java | 3 +++ .../components/schemas/ReadOnlyFirst.java | 3 +++ .../schemas/ReqPropsFromExplicitAddProps.java | 3 +++ .../schemas/ReqPropsFromTrueAddProps.java | 3 +++ .../schemas/ReqPropsFromUnsetAddProps.java | 3 +++ .../components/schemas/ReturnSchema.java | 3 +++ .../components/schemas/ScaleneTriangle.java | 3 +++ .../components/schemas/Schema200Response.java | 3 +++ .../schemas/SelfReferencingObjectModel.java | 3 +++ .../schemas/SimpleQuadrilateral.java | 3 +++ .../components/schemas/SpecialModelname.java | 3 +++ .../components/schemas/StringBooleanMap.java | 3 +++ .../components/schemas/Tag.java | 3 +++ .../components/schemas/TriangleInterface.java | 3 +++ .../components/schemas/User.java | 3 +++ .../components/schemas/Whale.java | 3 +++ .../components/schemas/Zebra.java | 3 +++ .../delete/HeaderParameters.java | 3 +++ .../delete/PathParameters.java | 3 +++ .../commonparamsubdir/get/PathParameters.java | 3 +++ .../get/QueryParameters.java | 3 +++ .../post/HeaderParameters.java | 3 +++ .../post/PathParameters.java | 3 +++ .../paths/fake/delete/HeaderParameters.java | 3 +++ .../paths/fake/delete/QueryParameters.java | 3 +++ .../paths/fake/get/HeaderParameters.java | 3 +++ .../paths/fake/get/QueryParameters.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../put/QueryParameters.java | 3 +++ .../put/QueryParameters.java | 3 +++ .../delete/PathParameters.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../post/QueryParameters.java | 3 +++ .../post/parameters/parameter1/Schema1.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../fakeobjinquery/get/QueryParameters.java | 3 +++ .../get/parameters/parameter0/Schema0.java | 3 +++ .../post/CookieParameters.java | 3 +++ .../post/HeaderParameters.java | 3 +++ .../post/PathParameters.java | 3 +++ .../post/QueryParameters.java | 3 +++ .../post/PathParameters.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../get/QueryParameters.java | 3 +++ .../get/QueryParameters.java | 3 +++ .../put/QueryParameters.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../petfindbystatus/get/QueryParameters.java | 3 +++ .../petfindbytags/get/QueryParameters.java | 3 +++ .../petpetid/delete/HeaderParameters.java | 3 +++ .../paths/petpetid/delete/PathParameters.java | 3 +++ .../paths/petpetid/get/PathParameters.java | 3 +++ .../paths/petpetid/post/PathParameters.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../post/PathParameters.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../delete/PathParameters.java | 3 +++ .../storeorderorderid/get/PathParameters.java | 3 +++ .../paths/userlogin/get/QueryParameters.java | 3 +++ .../get/responses/response200/Headers.java | 3 +++ .../userusername/delete/PathParameters.java | 3 +++ .../userusername/get/PathParameters.java | 3 +++ .../userusername/put/PathParameters.java | 3 +++ .../components/schemas/_objectOutputType.hbs | 3 +++ 144 files changed, 480 insertions(+) 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 c4de4ac39d0..03c2d7bc445 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 @@ -23,6 +23,9 @@ class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } + public static HeadersMap of(Map arg, SchemaConfiguration configuration) { + return Headers1.validate(arg, configuration); + } } public class Headers1 implements JsonSchema { 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 3ed565ccfce..2591b3339ef 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 @@ -23,6 +23,9 @@ class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } + public static HeadersMap of(Map arg, SchemaConfiguration configuration) { + return Headers1.validate(arg, configuration); + } } 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 ee4cc0d41a1..32fce172172 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 @@ -18,6 +18,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 4593514908d..573c76be765 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 @@ -26,6 +26,9 @@ class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } + public static HeadersMap of(Map arg, SchemaConfiguration configuration) { + return Headers1.validate(arg, configuration); + } } public class Headers1 implements JsonSchema { 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 4c5f1df5de3..9f5d098f56c 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 @@ -20,6 +20,9 @@ class AbstractStepMessageMap extends FrozenMap { AbstractStepMessageMap(FrozenMap m) { super(m); } + public static AbstractStepMessageMap of(Map arg, SchemaConfiguration configuration) { + return AbstractStepMessage1.validate(arg, configuration); + } } public class AbstractStepMessage1 implements JsonSchema { 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 4da26556f15..812a82d80fd 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 @@ -23,6 +23,9 @@ class MapPropertyMap extends FrozenMap { MapPropertyMap(FrozenMap m) { super(m); } + public static MapPropertyMap of(Map arg, SchemaConfiguration configuration) { + return MapProperty.validate(arg, configuration); + } } public class MapProperty implements JsonSchema { @@ -43,6 +46,9 @@ class AdditionalPropertiesMap extends FrozenMap { AdditionalPropertiesMap(FrozenMap m) { super(m); } + public static AdditionalPropertiesMap of(Map arg, SchemaConfiguration configuration) { + return AdditionalProperties1.validate(arg, configuration); + } } public class AdditionalProperties1 implements JsonSchema { @@ -60,6 +66,9 @@ class MapOfMapPropertyMap extends FrozenMap { MapOfMapPropertyMap(FrozenMap m) { super(m); } + public static MapOfMapPropertyMap of(Map arg, SchemaConfiguration configuration) { + return MapOfMapProperty.validate(arg, configuration); + } } public class MapOfMapProperty implements JsonSchema { @@ -89,6 +98,9 @@ class MapWithUndeclaredPropertiesAnytype3Map extends FrozenMap { MapWithUndeclaredPropertiesAnytype3Map(FrozenMap m) { super(m); } + public static MapWithUndeclaredPropertiesAnytype3Map of(Map arg, SchemaConfiguration configuration) { + return MapWithUndeclaredPropertiesAnytype3.validate(arg, configuration); + } } public class MapWithUndeclaredPropertiesAnytype3 implements JsonSchema { @@ -111,6 +123,9 @@ class EmptyMapMap extends FrozenMap { super(m); } // map with no key value pairs + public static EmptyMapMap of(Map arg, SchemaConfiguration configuration) { + return EmptyMap.validate(arg, configuration); + } } public class EmptyMap implements JsonSchema { @@ -131,6 +146,9 @@ class MapWithUndeclaredPropertiesStringMap extends FrozenMap { MapWithUndeclaredPropertiesStringMap(FrozenMap m) { super(m); } + public static MapWithUndeclaredPropertiesStringMap of(Map arg, SchemaConfiguration configuration) { + return MapWithUndeclaredPropertiesString.validate(arg, configuration); + } } public class MapWithUndeclaredPropertiesString implements JsonSchema { @@ -148,6 +166,9 @@ class AdditionalPropertiesClassMap extends FrozenMap { AdditionalPropertiesClassMap(FrozenMap m) { super(m); } + public static AdditionalPropertiesClassMap of(Map arg, SchemaConfiguration configuration) { + return AdditionalPropertiesClass1.validate(arg, configuration); + } } public class AdditionalPropertiesClass1 implements JsonSchema { 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 0f60d27c7fc..1d092bc8811 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 @@ -23,6 +23,9 @@ class Schema0Map extends FrozenMap { Schema0Map(FrozenMap m) { super(m); } + public static Schema0Map of(Map arg, SchemaConfiguration configuration) { + return Schema0.validate(arg, configuration); + } } public class Schema0 implements JsonSchema { @@ -90,6 +93,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { @@ -157,6 +163,9 @@ class Schema2Map extends FrozenMap { Schema2Map(FrozenMap m) { super(m); } + public static Schema2Map of(Map arg, SchemaConfiguration configuration) { + return Schema2.validate(arg, configuration); + } } public class Schema2 implements JsonSchema { 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 6f5c2117725..4b6dc1ecdd2 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 @@ -26,6 +26,9 @@ class AdditionalPropertiesWithArrayOfEnumsMap extends FrozenMap AdditionalPropertiesWithArrayOfEnumsMap(FrozenMap m) { super(m); } + public static AdditionalPropertiesWithArrayOfEnumsMap of(Map arg, SchemaConfiguration configuration) { + return AdditionalPropertiesWithArrayOfEnums1.validate(arg, configuration); + } } public class AdditionalPropertiesWithArrayOfEnums1 implements JsonSchema { 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 3d8ec1b8d4c..9373ba8ef33 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 @@ -18,6 +18,9 @@ class AddressMap extends FrozenMap { AddressMap(FrozenMap m) { super(m); } + public static AddressMap of(Map arg, SchemaConfiguration configuration) { + return Address1.validate(arg, configuration); + } } 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 7c850523691..7a66b3aab0b 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 @@ -29,6 +29,9 @@ class AnimalMap extends FrozenMap { AnimalMap(FrozenMap m) { super(m); } + public static AnimalMap of(Map arg, SchemaConfiguration configuration) { + return Animal1.validate(arg, configuration); + } } public class Animal1 implements JsonSchema { 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 4211d5ad904..84568c94ab0 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 @@ -480,6 +480,9 @@ class AnyTypeAndFormatMap extends FrozenMap { AnyTypeAndFormatMap(FrozenMap m) { super(m); } + public static AnyTypeAndFormatMap of(Map arg, SchemaConfiguration configuration) { + return AnyTypeAndFormat1.validate(arg, configuration); + } } public class AnyTypeAndFormat1 implements JsonSchema { 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 e6422288a03..3152e18c722 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 @@ -27,6 +27,9 @@ class ApiResponseMap extends FrozenMap { ApiResponseMap(FrozenMap m) { super(m); } + public static ApiResponseMap of(Map arg, SchemaConfiguration configuration) { + return ApiResponseSchema1.validate(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 f85bc62a2a7..6bc3dcc0aa8 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 @@ -34,6 +34,9 @@ class AppleMap extends FrozenMap { AppleMap(FrozenMap m) { super(m); } + public static AppleMap of(Map arg, SchemaConfiguration configuration) { + return Apple1.validate(arg, configuration); + } } public class Apple1 implements JsonSchema { 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 d693e617e97..85614f9c0d8 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 @@ -30,6 +30,9 @@ class AppleReqMap extends FrozenMap { AppleReqMap(FrozenMap m) { super(m); } + public static AppleReqMap of(Map arg, SchemaConfiguration configuration) { + return AppleReq1.validate(arg, configuration); + } } public class AppleReq1 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 e947d0bbbab..a1971823c6b 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 @@ -42,6 +42,9 @@ class ArrayOfArrayOfNumberOnlyMap extends FrozenMap { ArrayOfArrayOfNumberOnlyMap(FrozenMap m) { super(m); } + public static ArrayOfArrayOfNumberOnlyMap of(Map arg, SchemaConfiguration configuration) { + return ArrayOfArrayOfNumberOnly1.validate(arg, configuration); + } } public class ArrayOfArrayOfNumberOnly1 implements JsonSchema { 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 dbccd799e15..78ec514087c 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 @@ -32,6 +32,9 @@ class ArrayOfNumberOnlyMap extends FrozenMap { ArrayOfNumberOnlyMap(FrozenMap m) { super(m); } + public static ArrayOfNumberOnlyMap of(Map arg, SchemaConfiguration configuration) { + return ArrayOfNumberOnly1.validate(arg, configuration); + } } public class ArrayOfNumberOnly1 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 c04dba6c6b9..e449f849df4 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 @@ -76,6 +76,9 @@ class ArrayTestMap extends FrozenMap { ArrayTestMap(FrozenMap m) { super(m); } + public static ArrayTestMap of(Map arg, SchemaConfiguration configuration) { + return ArrayTest1.validate(arg, configuration); + } } public class ArrayTest1 implements JsonSchema { 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 4f832be8bcb..7fa4e37a8b0 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 @@ -20,6 +20,9 @@ class BananaMap extends FrozenMap { BananaMap(FrozenMap m) { super(m); } + public static BananaMap of(Map arg, SchemaConfiguration configuration) { + return Banana1.validate(arg, configuration); + } } public class Banana1 implements JsonSchema { 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 8afd03f5fd6..f9943212b1d 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 @@ -30,6 +30,9 @@ class BananaReqMap extends FrozenMap { BananaReqMap(FrozenMap m) { super(m); } + public static BananaReqMap of(Map arg, SchemaConfiguration configuration) { + return BananaReq1.validate(arg, configuration); + } } public class BananaReq1 implements JsonSchema { 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 25fc4e96f08..39c6f2234df 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 @@ -25,6 +25,9 @@ class BasquePigMap extends FrozenMap { BasquePigMap(FrozenMap m) { super(m); } + public static BasquePigMap of(Map arg, SchemaConfiguration configuration) { + return BasquePig1.validate(arg, configuration); + } } public class BasquePig1 implements JsonSchema { 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 f34d7b1f1ad..9f174157ac3 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 @@ -35,6 +35,9 @@ class CapitalizationMap extends FrozenMap { CapitalizationMap(FrozenMap m) { super(m); } + public static CapitalizationMap of(Map arg, SchemaConfiguration configuration) { + return Capitalization1.validate(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 31d9647f52b..ec6b63c95c2 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 @@ -25,6 +25,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 21223557163..bdff56b5956 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 @@ -29,6 +29,9 @@ class CategoryMap extends FrozenMap { CategoryMap(FrozenMap m) { super(m); } + public static CategoryMap of(Map arg, SchemaConfiguration configuration) { + return Category1.validate(arg, configuration); + } } public class Category1 implements JsonSchema { 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 2618c15db40..24af0a6247d 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 @@ -25,6 +25,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 22dd9b6f943..c1f01e99a31 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 @@ -23,6 +23,9 @@ class ClassModelMap extends FrozenMap { ClassModelMap(FrozenMap m) { super(m); } + public static ClassModelMap of(Map arg, SchemaConfiguration configuration) { + return ClassModel1.validate(arg, configuration); + } } public class ClassModel1 implements JsonSchema { 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 3be7ad47ef7..47ef5468db4 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 @@ -20,6 +20,9 @@ class ClientMap extends FrozenMap { ClientMap(FrozenMap m) { super(m); } + public static ClientMap of(Map arg, SchemaConfiguration configuration) { + return Client1.validate(arg, configuration); + } } 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 e2d47160a7e..ba606dd8a60 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 @@ -30,6 +30,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 12107e99653..3245a87a937 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 @@ -25,6 +25,9 @@ class DanishPigMap extends FrozenMap { DanishPigMap(FrozenMap m) { super(m); } + public static DanishPigMap of(Map arg, SchemaConfiguration configuration) { + return DanishPig1.validate(arg, configuration); + } } public class DanishPig1 implements JsonSchema { 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 bba129c5b48..9634763ce32 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 @@ -25,6 +25,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 4daf7ffaba4..12cde513263 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 @@ -28,6 +28,9 @@ class DrawingMap extends FrozenMap { DrawingMap(FrozenMap m) { super(m); } + public static DrawingMap of(Map arg, SchemaConfiguration configuration) { + return Drawing1.validate(arg, configuration); + } } public class Drawing1 implements JsonSchema { 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 1e6c9fcde1b..536c729aeb6 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 @@ -46,6 +46,9 @@ class EnumArraysMap extends FrozenMap { EnumArraysMap(FrozenMap m) { super(m); } + public static EnumArraysMap of(Map arg, SchemaConfiguration configuration) { + return EnumArrays1.validate(arg, configuration); + } } public class EnumArrays1 implements JsonSchema { 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 c95512e52d4..72e5af96673 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 @@ -72,6 +72,9 @@ class EnumTestMap extends FrozenMap { EnumTestMap(FrozenMap m) { super(m); } + public static EnumTestMap of(Map arg, SchemaConfiguration configuration) { + return EnumTest1.validate(arg, configuration); + } } public class EnumTest1 implements JsonSchema { 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 88c3fdb9ac1..2b41141bba5 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 @@ -30,6 +30,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 fd496710326..68e27802ab2 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 @@ -20,6 +20,9 @@ class FileMap extends FrozenMap { FileMap(FrozenMap m) { super(m); } + public static FileMap of(Map arg, SchemaConfiguration configuration) { + return File1.validate(arg, configuration); + } } 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 19f0fdd5160..bfd05ff9c67 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 @@ -28,6 +28,9 @@ class FileSchemaTestClassMap extends FrozenMap { FileSchemaTestClassMap(FrozenMap m) { super(m); } + public static FileSchemaTestClassMap of(Map arg, SchemaConfiguration configuration) { + return FileSchemaTestClass1.validate(arg, configuration); + } } public class FileSchemaTestClass1 implements JsonSchema { 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 cf15c409432..916a4018b2f 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 @@ -16,6 +16,9 @@ class FooMap extends FrozenMap { FooMap(FrozenMap m) { super(m); } + public static FooMap of(Map arg, SchemaConfiguration configuration) { + return Foo1.validate(arg, configuration); + } } public class Foo1 implements JsonSchema { 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 a587831535d..3fc3ca2da8b 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 @@ -212,6 +212,9 @@ class FormatTestMap extends FrozenMap { FormatTestMap(FrozenMap m) { super(m); } + public static FormatTestMap of(Map arg, SchemaConfiguration configuration) { + return FormatTest1.validate(arg, configuration); + } } public class FormatTest1 implements JsonSchema { 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 9527113ad4f..31aaaabce7e 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 @@ -24,6 +24,9 @@ class FromSchemaMap extends FrozenMap { FromSchemaMap(FrozenMap m) { super(m); } + public static FromSchemaMap of(Map arg, SchemaConfiguration configuration) { + return FromSchema1.validate(arg, configuration); + } } 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 32b57af2784..7b15335521d 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 @@ -23,6 +23,9 @@ class FruitMap extends FrozenMap { FruitMap(FrozenMap m) { super(m); } + public static FruitMap of(Map arg, SchemaConfiguration configuration) { + return Fruit1.validate(arg, configuration); + } } public class Fruit1 implements JsonSchema { 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 0610ac57551..843159a40ff 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 @@ -23,6 +23,9 @@ class GmFruitMap extends FrozenMap { GmFruitMap(FrozenMap m) { super(m); } + public static GmFruitMap of(Map arg, SchemaConfiguration configuration) { + return GmFruit1.validate(arg, configuration); + } } public class GmFruit1 implements JsonSchema { 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 d936d09157d..5bb45125be5 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 @@ -20,6 +20,9 @@ class GrandparentAnimalMap extends FrozenMap { GrandparentAnimalMap(FrozenMap m) { super(m); } + public static GrandparentAnimalMap of(Map arg, SchemaConfiguration configuration) { + return GrandparentAnimal1.validate(arg, configuration); + } } public class GrandparentAnimal1 implements JsonSchema { 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 ecd7cbc6077..d393b7891ce 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 @@ -23,6 +23,9 @@ class HasOnlyReadOnlyMap extends FrozenMap { HasOnlyReadOnlyMap(FrozenMap m) { super(m); } + public static HasOnlyReadOnlyMap of(Map arg, SchemaConfiguration configuration) { + return HasOnlyReadOnly1.validate(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 05915a0db6d..03ab60e8cad 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 @@ -29,6 +29,9 @@ class HealthCheckResultMap extends FrozenMap { HealthCheckResultMap(FrozenMap m) { super(m); } + public static HealthCheckResultMap of(Map arg, SchemaConfiguration configuration) { + return HealthCheckResult1.validate(arg, configuration); + } } public class HealthCheckResult1 implements JsonSchema { 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 74959bdf427..85bbfe9897c 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 @@ -30,6 +30,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 935e6f19545..92a04b086e7 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 @@ -38,6 +38,9 @@ class JSONPatchRequestAddReplaceTestMap extends FrozenMap { JSONPatchRequestAddReplaceTestMap(FrozenMap m) { super(m); } + public static JSONPatchRequestAddReplaceTestMap of(Map arg, SchemaConfiguration configuration) { + return JSONPatchRequestAddReplaceTest1.validate(arg, configuration); + } } public class JSONPatchRequestAddReplaceTest1 implements JsonSchema { 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 e143db789d8..14a4587e2a8 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 @@ -38,6 +38,9 @@ class JSONPatchRequestMoveCopyMap extends FrozenMap { JSONPatchRequestMoveCopyMap(FrozenMap m) { super(m); } + public static JSONPatchRequestMoveCopyMap of(Map arg, SchemaConfiguration configuration) { + return JSONPatchRequestMoveCopy1.validate(arg, configuration); + } } public class JSONPatchRequestMoveCopy1 implements JsonSchema { 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 59f0c49966e..973c4f098e5 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 @@ -35,6 +35,9 @@ class JSONPatchRequestRemoveMap extends FrozenMap { JSONPatchRequestRemoveMap(FrozenMap m) { super(m); } + public static JSONPatchRequestRemoveMap of(Map arg, SchemaConfiguration configuration) { + return JSONPatchRequestRemove1.validate(arg, configuration); + } } public class JSONPatchRequestRemove1 implements JsonSchema { 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 96d562abb81..ff18f9644b0 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 @@ -21,6 +21,9 @@ class AdditionalPropertiesMap extends FrozenMap { AdditionalPropertiesMap(FrozenMap m) { super(m); } + public static AdditionalPropertiesMap of(Map arg, SchemaConfiguration configuration) { + return AdditionalProperties.validate(arg, configuration); + } } public class AdditionalProperties implements JsonSchema { @@ -38,6 +41,9 @@ class MapMapOfStringMap extends FrozenMap { MapMapOfStringMap(FrozenMap m) { super(m); } + public static MapMapOfStringMap of(Map arg, SchemaConfiguration configuration) { + return MapMapOfString.validate(arg, configuration); + } } public class MapMapOfString implements JsonSchema { @@ -64,6 +70,9 @@ class MapOfEnumStringMap extends FrozenMap { MapOfEnumStringMap(FrozenMap m) { super(m); } + public static MapOfEnumStringMap of(Map arg, SchemaConfiguration configuration) { + return MapOfEnumString.validate(arg, configuration); + } } public class MapOfEnumString implements JsonSchema { @@ -84,6 +93,9 @@ class DirectMapMap extends FrozenMap { DirectMapMap(FrozenMap m) { super(m); } + public static DirectMapMap of(Map arg, SchemaConfiguration configuration) { + return DirectMap.validate(arg, configuration); + } } public class DirectMap implements JsonSchema { @@ -101,6 +113,9 @@ class MapTestMap extends FrozenMap { MapTestMap(FrozenMap m) { super(m); } + public static MapTestMap of(Map arg, SchemaConfiguration configuration) { + return MapTest1.validate(arg, configuration); + } } public class MapTest1 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 16790c8d3b4..5e24c0b2703 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 @@ -24,6 +24,9 @@ class MapMap extends FrozenMap { MapMap(FrozenMap m) { super(m); } + public static MapMap of(Map arg, SchemaConfiguration configuration) { + return MapSchema.validate(arg, configuration); + } } public class MapSchema implements JsonSchema { @@ -41,6 +44,9 @@ class MixedPropertiesAndAdditionalPropertiesClassMap extends FrozenMap m) { super(m); } + public static MixedPropertiesAndAdditionalPropertiesClassMap of(Map arg, SchemaConfiguration configuration) { + return MixedPropertiesAndAdditionalPropertiesClass1.validate(arg, configuration); + } } public class MixedPropertiesAndAdditionalPropertiesClass1 implements JsonSchema { 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 a43ef92359d..3bba723e647 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 @@ -26,6 +26,9 @@ class MoneyMap extends FrozenMap { MoneyMap(FrozenMap m) { super(m); } + public static MoneyMap of(Map arg, SchemaConfiguration configuration) { + return Money1.validate(arg, configuration); + } } public class Money1 implements JsonSchema { 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 8f6729ced19..fe412e82058 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 @@ -26,6 +26,9 @@ class MyObjectDtoMap extends FrozenMap { MyObjectDtoMap(FrozenMap m) { super(m); } + public static MyObjectDtoMap of(Map arg, SchemaConfiguration configuration) { + return MyObjectDto1.validate(arg, configuration); + } } 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 3dfc3c8fe21..4cab04447d1 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 @@ -32,6 +32,9 @@ class NameMap extends FrozenMap { NameMap(FrozenMap m) { super(m); } + public static NameMap of(Map arg, SchemaConfiguration configuration) { + return Name1.validate(arg, configuration); + } } public class Name1 implements JsonSchema { 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 4cae89afd6f..7bf90ace3e8 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 @@ -29,6 +29,9 @@ class NoAdditionalPropertiesMap extends FrozenMap { NoAdditionalPropertiesMap(FrozenMap m) { super(m); } + public static NoAdditionalPropertiesMap of(Map arg, SchemaConfiguration configuration) { + return NoAdditionalProperties1.validate(arg, configuration); + } } public class NoAdditionalProperties1 implements JsonSchema { 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 2dcce39bfad..7caa1a89034 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 @@ -214,6 +214,9 @@ class ObjectNullablePropMap extends FrozenMap { ObjectNullablePropMap(FrozenMap m) { super(m); } + public static ObjectNullablePropMap of(Map arg, SchemaConfiguration configuration) { + return ObjectNullableProp.validate(arg, configuration); + } } public class ObjectNullableProp implements JsonSchema { @@ -247,6 +250,9 @@ class ObjectAndItemsNullablePropMap extends FrozenMap { ObjectAndItemsNullablePropMap(FrozenMap m) { super(m); } + public static ObjectAndItemsNullablePropMap of(Map arg, SchemaConfiguration configuration) { + return ObjectAndItemsNullableProp.validate(arg, configuration); + } } public class ObjectAndItemsNullableProp implements JsonSchema { @@ -280,6 +286,9 @@ class ObjectItemsNullableMap extends FrozenMap { ObjectItemsNullableMap(FrozenMap m) { super(m); } + public static ObjectItemsNullableMap of(Map arg, SchemaConfiguration configuration) { + return ObjectItemsNullable.validate(arg, configuration); + } } public class ObjectItemsNullable implements JsonSchema { @@ -297,6 +306,9 @@ class NullableClassMap extends FrozenMap { NullableClassMap(FrozenMap m) { super(m); } + public static NullableClassMap of(Map arg, SchemaConfiguration configuration) { + return NullableClass1.validate(arg, configuration); + } } public class NullableClass1 implements JsonSchema { 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 af70645c71f..e9c46142b75 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 @@ -20,6 +20,9 @@ class NumberOnlyMap extends FrozenMap { NumberOnlyMap(FrozenMap m) { super(m); } + public static NumberOnlyMap of(Map arg, SchemaConfiguration configuration) { + return NumberOnly1.validate(arg, configuration); + } } public class NumberOnly1 implements JsonSchema { 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 dd7ab069769..dbaa856b2a8 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 @@ -20,6 +20,9 @@ class ObjWithRequiredPropsMap extends FrozenMap { ObjWithRequiredPropsMap(FrozenMap m) { super(m); } + public static ObjWithRequiredPropsMap of(Map arg, SchemaConfiguration configuration) { + return ObjWithRequiredProps1.validate(arg, configuration); + } } public class ObjWithRequiredProps1 implements JsonSchema { 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 3cac8085502..dee0ad81c3b 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 @@ -20,6 +20,9 @@ class ObjWithRequiredPropsBaseMap extends FrozenMap { ObjWithRequiredPropsBaseMap(FrozenMap m) { super(m); } + public static ObjWithRequiredPropsBaseMap of(Map arg, SchemaConfiguration configuration) { + return ObjWithRequiredPropsBase1.validate(arg, configuration); + } } public class ObjWithRequiredPropsBase1 implements JsonSchema { 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 37240ed0640..96edb20b8c5 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 @@ -23,6 +23,9 @@ class ObjectModelWithArgAndArgsPropertiesMap extends FrozenMap { ObjectModelWithArgAndArgsPropertiesMap(FrozenMap m) { super(m); } + public static ObjectModelWithArgAndArgsPropertiesMap of(Map arg, SchemaConfiguration configuration) { + return ObjectModelWithArgAndArgsProperties1.validate(arg, configuration); + } } public class ObjectModelWithArgAndArgsProperties1 implements JsonSchema { 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 f1b1c7ae76b..db8403eae79 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 @@ -16,6 +16,9 @@ class ObjectModelWithRefPropsMap extends FrozenMap { ObjectModelWithRefPropsMap(FrozenMap m) { super(m); } + public static ObjectModelWithRefPropsMap of(Map arg, SchemaConfiguration configuration) { + return ObjectModelWithRefProps1.validate(arg, configuration); + } } public class ObjectModelWithRefProps1 implements JsonSchema { 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 d0c5101e7c4..be7d873450e 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 @@ -25,6 +25,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 153bd0aab90..c353b6666dd 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 @@ -23,6 +23,9 @@ class ObjectWithCollidingPropertiesMap extends FrozenMap { ObjectWithCollidingPropertiesMap(FrozenMap m) { super(m); } + public static ObjectWithCollidingPropertiesMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithCollidingProperties1.validate(arg, configuration); + } } 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 86b00b4154a..aebebbef820 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 @@ -20,6 +20,9 @@ class ObjectWithDecimalPropertiesMap extends FrozenMap { ObjectWithDecimalPropertiesMap(FrozenMap m) { super(m); } + public static ObjectWithDecimalPropertiesMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithDecimalProperties1.validate(arg, configuration); + } } 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 84407d8c506..7c6d6f24808 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 @@ -28,6 +28,9 @@ class ObjectWithDifficultlyNamedPropsMap extends FrozenMap { ObjectWithDifficultlyNamedPropsMap(FrozenMap m) { super(m); } + public static ObjectWithDifficultlyNamedPropsMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithDifficultlyNamedProps1.validate(arg, configuration); + } } public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { 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 6b7208ccf99..4ebfb5112a4 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 @@ -80,6 +80,9 @@ class ObjectWithInlineCompositionPropertyMap extends FrozenMap { ObjectWithInlineCompositionPropertyMap(FrozenMap m) { super(m); } + public static ObjectWithInlineCompositionPropertyMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithInlineCompositionProperty1.validate(arg, configuration); + } } public class ObjectWithInlineCompositionProperty1 implements JsonSchema { 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 3db702cc481..78152df1275 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 @@ -16,6 +16,9 @@ class ObjectWithInvalidNamedRefedPropertiesMap extends FrozenMap ObjectWithInvalidNamedRefedPropertiesMap(FrozenMap m) { super(m); } + public static ObjectWithInvalidNamedRefedPropertiesMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithInvalidNamedRefedProperties1.validate(arg, configuration); + } } public class ObjectWithInvalidNamedRefedProperties1 implements JsonSchema { 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 20230d536a7..67bea92e978 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 @@ -24,6 +24,9 @@ class ObjectWithNonIntersectingValuesMap extends FrozenMap { ObjectWithNonIntersectingValuesMap(FrozenMap m) { super(m); } + public static ObjectWithNonIntersectingValuesMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithNonIntersectingValues1.validate(arg, configuration); + } } 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 11c83c36546..9597466f52b 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 @@ -30,6 +30,9 @@ class ObjectWithOnlyOptionalPropsMap extends FrozenMap { ObjectWithOnlyOptionalPropsMap(FrozenMap m) { super(m); } + public static ObjectWithOnlyOptionalPropsMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithOnlyOptionalProps1.validate(arg, configuration); + } } 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 f0d80d54acc..b5ca83e74f5 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 @@ -20,6 +20,9 @@ class ObjectWithOptionalTestPropMap extends FrozenMap { ObjectWithOptionalTestPropMap(FrozenMap m) { super(m); } + public static ObjectWithOptionalTestPropMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithOptionalTestProp1.validate(arg, configuration); + } } public class ObjectWithOptionalTestProp1 implements JsonSchema { 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 b73d7e86d1c..f36acf6b6c3 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 @@ -44,6 +44,9 @@ class OrderMap extends FrozenMap { OrderMap(FrozenMap m) { super(m); } + public static OrderMap of(Map arg, SchemaConfiguration configuration) { + return Order1.validate(arg, configuration); + } } 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 6b9b74fe38a..049f726aa25 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 @@ -38,6 +38,9 @@ class PaginatedResultMyObjectDtoMap extends FrozenMap { PaginatedResultMyObjectDtoMap(FrozenMap m) { super(m); } + public static PaginatedResultMyObjectDtoMap of(Map arg, SchemaConfiguration configuration) { + return PaginatedResultMyObjectDto1.validate(arg, configuration); + } } public class PaginatedResultMyObjectDto1 implements JsonSchema { 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 796113c245f..c365a9c4131 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 @@ -58,6 +58,9 @@ class PetMap extends FrozenMap { PetMap(FrozenMap m) { super(m); } + public static PetMap of(Map arg, SchemaConfiguration configuration) { + return Pet1.validate(arg, configuration); + } } public class Pet1 implements JsonSchema { 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 5a5150dc68a..4419fd904de 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 @@ -20,6 +20,9 @@ class PlayerMap extends FrozenMap { PlayerMap(FrozenMap m) { super(m); } + public static PlayerMap of(Map arg, SchemaConfiguration configuration) { + return Player1.validate(arg, configuration); + } } 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 3509182823a..7cc5f4b2db5 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 @@ -20,6 +20,9 @@ class PublicKeyMap extends FrozenMap { PublicKeyMap(FrozenMap m) { super(m); } + public static PublicKeyMap of(Map arg, SchemaConfiguration configuration) { + return PublicKey1.validate(arg, configuration); + } } public class PublicKey1 implements JsonSchema { 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 87f16c6e0fb..f2177b3a1dd 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 @@ -34,6 +34,9 @@ class QuadrilateralInterfaceMap extends FrozenMap { QuadrilateralInterfaceMap(FrozenMap m) { super(m); } + public static QuadrilateralInterfaceMap of(Map arg, SchemaConfiguration configuration) { + return QuadrilateralInterface1.validate(arg, configuration); + } } public class QuadrilateralInterface1 implements JsonSchema { 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 dd238f8e253..625d6dd1f90 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 @@ -23,6 +23,9 @@ class ReadOnlyFirstMap extends FrozenMap { ReadOnlyFirstMap(FrozenMap m) { super(m); } + public static ReadOnlyFirstMap of(Map arg, SchemaConfiguration configuration) { + return ReadOnlyFirst1.validate(arg, configuration); + } } public class ReadOnlyFirst1 implements JsonSchema { 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 7063b7c6867..df39a1c4c52 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 @@ -18,6 +18,9 @@ class ReqPropsFromExplicitAddPropsMap extends FrozenMap { ReqPropsFromExplicitAddPropsMap(FrozenMap m) { super(m); } + public static ReqPropsFromExplicitAddPropsMap of(Map arg, SchemaConfiguration configuration) { + return ReqPropsFromExplicitAddProps1.validate(arg, configuration); + } } public class ReqPropsFromExplicitAddProps1 implements JsonSchema { 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 b79a8a416c4..b9956603ed7 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 @@ -18,6 +18,9 @@ class ReqPropsFromTrueAddPropsMap extends FrozenMap { ReqPropsFromTrueAddPropsMap(FrozenMap m) { super(m); } + public static ReqPropsFromTrueAddPropsMap of(Map arg, SchemaConfiguration configuration) { + return ReqPropsFromTrueAddProps1.validate(arg, configuration); + } } public class ReqPropsFromTrueAddProps1 implements JsonSchema { 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 6a17bf539e4..776e2748685 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 @@ -14,6 +14,9 @@ class ReqPropsFromUnsetAddPropsMap extends FrozenMap { ReqPropsFromUnsetAddPropsMap(FrozenMap m) { super(m); } + public static ReqPropsFromUnsetAddPropsMap of(Map arg, SchemaConfiguration configuration) { + return ReqPropsFromUnsetAddProps1.validate(arg, configuration); + } } public class ReqPropsFromUnsetAddProps1 implements JsonSchema { 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 9447f2f20e0..6f901e819ae 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 @@ -23,6 +23,9 @@ class ReturnMap extends FrozenMap { ReturnMap(FrozenMap m) { super(m); } + public static ReturnMap of(Map arg, SchemaConfiguration configuration) { + return ReturnSchema1.validate(arg, configuration); + } } public class ReturnSchema1 implements JsonSchema { 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 5ac861489ec..f4ae6062f5b 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 @@ -30,6 +30,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 f95742a16c2..cc171685b36 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 @@ -27,6 +27,9 @@ class Schema200ResponseMap extends FrozenMap { Schema200ResponseMap(FrozenMap m) { super(m); } + public static Schema200ResponseMap of(Map arg, SchemaConfiguration configuration) { + return Schema200Response1.validate(arg, configuration); + } } public class Schema200Response1 implements JsonSchema { 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 a0ad0e0dc04..837e0dda484 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 @@ -16,6 +16,9 @@ class SelfReferencingObjectModelMap extends FrozenMap { SelfReferencingObjectModelMap(FrozenMap m) { super(m); } + public static SelfReferencingObjectModelMap of(Map arg, SchemaConfiguration configuration) { + return SelfReferencingObjectModel1.validate(arg, configuration); + } } public class SelfReferencingObjectModel1 implements JsonSchema { 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 0a73a8d3f4e..69e80f9f969 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 @@ -30,6 +30,9 @@ class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } + public static Schema1Map of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 ad988b615c2..b9c196d2c16 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 @@ -20,6 +20,9 @@ class SpecialModelnameMap extends FrozenMap { SpecialModelnameMap(FrozenMap m) { super(m); } + public static SpecialModelnameMap of(Map arg, SchemaConfiguration configuration) { + return SpecialModelname1.validate(arg, configuration); + } } 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 a1391269bfe..d4fd9286d7f 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 @@ -18,6 +18,9 @@ class StringBooleanMapMap extends FrozenMap { StringBooleanMapMap(FrozenMap m) { super(m); } + public static StringBooleanMapMap of(Map arg, SchemaConfiguration configuration) { + return StringBooleanMap1.validate(arg, configuration); + } } public class StringBooleanMap1 implements JsonSchema { 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 6d31b1d4d13..0b9478615ef 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 @@ -24,6 +24,9 @@ class TagMap extends FrozenMap { TagMap(FrozenMap m) { super(m); } + public static TagMap of(Map arg, SchemaConfiguration configuration) { + return Tag1.validate(arg, configuration); + } } public class Tag1 implements JsonSchema { 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 d65e93f30fb..04351d88d6a 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 @@ -34,6 +34,9 @@ class TriangleInterfaceMap extends FrozenMap { TriangleInterfaceMap(FrozenMap m) { super(m); } + public static TriangleInterfaceMap of(Map arg, SchemaConfiguration configuration) { + return TriangleInterface1.validate(arg, configuration); + } } public class TriangleInterface1 implements JsonSchema { 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 940809ae9f5..c11c0880e1a 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 @@ -126,6 +126,9 @@ class UserMap extends FrozenMap { UserMap(FrozenMap m) { super(m); } + public static UserMap of(Map arg, SchemaConfiguration configuration) { + return User1.validate(arg, configuration); + } } public class User1 implements JsonSchema { 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 15960964451..5aad18e337a 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 @@ -32,6 +32,9 @@ class WhaleMap extends FrozenMap { WhaleMap(FrozenMap m) { super(m); } + public static WhaleMap of(Map arg, SchemaConfiguration configuration) { + return Whale1.validate(arg, configuration); + } } public class Whale1 implements JsonSchema { 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 4538e7dda4c..ed0be8cb887 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 @@ -38,6 +38,9 @@ class ZebraMap extends FrozenMap { ZebraMap(FrozenMap m) { super(m); } + public static ZebraMap of(Map arg, SchemaConfiguration configuration) { + return Zebra1.validate(arg, configuration); + } } public class Zebra1 implements JsonSchema { 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 b7f95648f8a..c4927dd24b2 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 @@ -23,6 +23,9 @@ class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } + public static HeaderParametersMap of(Map arg, SchemaConfiguration configuration) { + return HeaderParameters1.validate(arg, configuration); + } } 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 5d6e4029a75..5919f5e268e 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 d8b2d56569e..bb0a3448a01 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 fa1b6a57011..1e01fd1c7d6 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 @@ -23,6 +23,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 f083ba67257..d00deb7d76d 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 @@ -23,6 +23,9 @@ class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } + public static HeaderParametersMap of(Map arg, SchemaConfiguration configuration) { + return HeaderParameters1.validate(arg, configuration); + } } 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 d57696a4199..c134c2add67 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 45686f9de2e..a9d163525c4 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 @@ -24,6 +24,9 @@ class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } + public static HeaderParametersMap of(Map arg, SchemaConfiguration configuration) { + return HeaderParameters1.validate(arg, configuration); + } } public class HeaderParameters1 implements JsonSchema { 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 bc337978433..af979e88f97 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 @@ -26,6 +26,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 b6fd97bc0e7..848d2381131 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 @@ -24,6 +24,9 @@ class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } + public static HeaderParametersMap of(Map arg, SchemaConfiguration configuration) { + return HeaderParameters1.validate(arg, configuration); + } } 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 251a319d549..909c5b0232e 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 @@ -26,6 +26,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 9ef743881e0..b98674baf4b 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 @@ -46,6 +46,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 98f2494ae44..c63392ed81d 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 @@ -174,6 +174,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 da8b6f23212..edebcd93e77 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 @@ -23,6 +23,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 673656ff526..330e57f9b7b 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 @@ -25,6 +25,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 6afa73b144f..04d0d38fbbd 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 2b5ce6f642f..e78c1162df9 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 @@ -18,6 +18,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 c90996d2a2f..a1ae8445f8d 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 @@ -24,6 +24,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 8d9a9d620a5..df1fc6458e4 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 @@ -80,6 +80,9 @@ class SchemaMap1 extends FrozenMap { SchemaMap1(FrozenMap m) { super(m); } + public static SchemaMap1 of(Map arg, SchemaConfiguration configuration) { + return Schema11.validate(arg, configuration); + } } public class Schema11 implements JsonSchema { 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 ec1388bf521..6cda6543768 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 @@ -80,6 +80,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 2021b7b8163..b915787f074 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 @@ -80,6 +80,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 9f6ede194e9..30c4c506e38 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 @@ -23,6 +23,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 f840bf8ab70..5dfa5095105 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 @@ -20,6 +20,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 c70fc2d602a..38e7c094224 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 @@ -20,6 +20,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 cdfe50fabd8..e377a43858f 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 @@ -23,6 +23,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } 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 0096ad64c88..4b7f930fba2 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 @@ -20,6 +20,9 @@ class SchemaMap0 extends FrozenMap { SchemaMap0(FrozenMap m) { super(m); } + public static SchemaMap0 of(Map arg, SchemaConfiguration configuration) { + return Schema01.validate(arg, configuration); + } } public class Schema01 implements JsonSchema { 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 9a6eae66c91..077f03730f6 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 @@ -27,6 +27,9 @@ class CookieParametersMap extends FrozenMap { CookieParametersMap(FrozenMap m) { super(m); } + public static CookieParametersMap of(Map arg, SchemaConfiguration configuration) { + return CookieParameters1.validate(arg, configuration); + } } 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 1e020d60bbb..0bb04604a90 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 @@ -26,6 +26,9 @@ class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } + public static HeaderParametersMap of(Map arg, SchemaConfiguration configuration) { + return HeaderParameters1.validate(arg, configuration); + } } 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 bca23ce0207..1e8810b5ade 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 @@ -27,6 +27,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 75affb668d7..b742a8d2c54 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 @@ -27,6 +27,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 7b281b1371a..fbd4a1d007e 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 72675a8c05a..f7b91ae4d3f 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 @@ -25,6 +25,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 3ade7185de6..2ddc8f3427a 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 @@ -23,6 +23,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 3104437de25..8e68a923222 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 @@ -23,6 +23,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 6d076571736..bcb3fe203bd 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 @@ -28,6 +28,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 92d1a5efcff..e6b8602b84b 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 @@ -25,6 +25,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 702ac89c7b0..8079148a1a0 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 @@ -33,6 +33,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 1a5adc1f10f..a0ca8b5ff00 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 @@ -17,6 +17,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 efd5d59bfd2..af7183fb903 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 @@ -23,6 +23,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 90926c57da2..f5ba41aec92 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 @@ -23,6 +23,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 504e2d4cf6f..f639bd99a1d 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 @@ -23,6 +23,9 @@ class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } + public static HeaderParametersMap of(Map arg, SchemaConfiguration configuration) { + return HeaderParameters1.validate(arg, configuration); + } } 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 0207168fa00..67de35e1814 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 e4986abf8c5..936f11e6919 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 d97edaaaede..a2b5974cfbf 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 0da278221f0..82bc0bab115 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 @@ -23,6 +23,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 3626f352f76..ee529037012 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 946320c3fd7..09f06bbf05d 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 @@ -25,6 +25,9 @@ class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } + public static SchemaMap of(Map arg, SchemaConfiguration configuration) { + return Schema1.validate(arg, configuration); + } } public class Schema1 implements JsonSchema { 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 36efb1519ee..6f32197b600 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 043e45de2ac..c21dc029f85 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 dfeda2518f6..5098a2c7dc8 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 @@ -24,6 +24,9 @@ class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } + public static QueryParametersMap of(Map arg, SchemaConfiguration configuration) { + return QueryParameters1.validate(arg, configuration); + } } public class QueryParameters1 implements JsonSchema { 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 d590bc0cdff..edd8947c7df 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 @@ -27,6 +27,9 @@ class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } + public static HeadersMap of(Map arg, SchemaConfiguration configuration) { + return Headers1.validate(arg, configuration); + } } public class Headers1 implements JsonSchema { 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 4250469beaf..8019a318a2c 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 b0df1c5c7cd..db9213d030b 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { 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 479c935772f..7c1760282a6 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 @@ -23,6 +23,9 @@ class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } + public static PathParametersMap of(Map arg, SchemaConfiguration configuration) { + return PathParameters1.validate(arg, configuration); + } } public class PathParameters1 implements JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs index d99d18e8f85..0aba48b3de8 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs @@ -27,6 +27,9 @@ class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap { {{/if}} {{/eq}} {{/eq}} + public static {{mapOutputJsonPathPiece.camelCase}} of(Map arg, SchemaConfiguration configuration) { + return {{jsonPathPiece.camelCase}}.validate(arg, configuration); + } {{!> components/schemas/__new__ }} {{!> components/schemas/_object_output_properties }} } \ No newline at end of file From 186603bb6db6547e788f3eabb8814fb4b9b6a23b Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sat, 18 Nov 2023 18:13:21 -0800 Subject: [PATCH 03/15] Adds getMapOutputInstance method --- .../responses/headerswithnobody/Headers.java | 3 +++ .../Headers.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../successwithjsonapiresponse/Headers.java | 3 +++ .../schemas/AbstractStepMessage.java | 3 +++ .../schemas/AdditionalPropertiesClass.java | 21 +++++++++++++++++++ .../AdditionalPropertiesValidator.java | 9 ++++++++ .../AdditionalPropertiesWithArrayOfEnums.java | 3 +++ .../components/schemas/Address.java | 3 +++ .../components/schemas/Animal.java | 3 +++ .../components/schemas/AnyTypeAndFormat.java | 3 +++ .../components/schemas/ApiResponseSchema.java | 3 +++ .../components/schemas/AppleReq.java | 3 +++ .../schemas/ArrayOfArrayOfNumberOnly.java | 3 +++ .../components/schemas/ArrayOfNumberOnly.java | 3 +++ .../components/schemas/ArrayTest.java | 3 +++ .../components/schemas/Banana.java | 3 +++ .../components/schemas/BananaReq.java | 3 +++ .../components/schemas/BasquePig.java | 3 +++ .../components/schemas/Capitalization.java | 3 +++ .../components/schemas/Cat.java | 3 +++ .../components/schemas/Category.java | 3 +++ .../components/schemas/ChildCat.java | 3 +++ .../components/schemas/Client.java | 3 +++ .../schemas/ComplexQuadrilateral.java | 3 +++ .../components/schemas/DanishPig.java | 3 +++ .../components/schemas/Dog.java | 3 +++ .../components/schemas/Drawing.java | 3 +++ .../components/schemas/EnumArrays.java | 3 +++ .../components/schemas/EnumTest.java | 3 +++ .../schemas/EquilateralTriangle.java | 3 +++ .../components/schemas/File.java | 3 +++ .../schemas/FileSchemaTestClass.java | 3 +++ .../components/schemas/Foo.java | 3 +++ .../components/schemas/FormatTest.java | 3 +++ .../components/schemas/FromSchema.java | 3 +++ .../components/schemas/GrandparentAnimal.java | 3 +++ .../components/schemas/HasOnlyReadOnly.java | 3 +++ .../components/schemas/HealthCheckResult.java | 3 +++ .../components/schemas/IsoscelesTriangle.java | 3 +++ .../JSONPatchRequestAddReplaceTest.java | 3 +++ .../schemas/JSONPatchRequestMoveCopy.java | 3 +++ .../schemas/JSONPatchRequestRemove.java | 3 +++ .../components/schemas/MapTest.java | 15 +++++++++++++ ...ropertiesAndAdditionalPropertiesClass.java | 6 ++++++ .../components/schemas/Money.java | 3 +++ .../components/schemas/MyObjectDto.java | 3 +++ .../schemas/NoAdditionalProperties.java | 3 +++ .../components/schemas/NullableClass.java | 6 ++++++ .../components/schemas/NumberOnly.java | 3 +++ .../schemas/ObjWithRequiredProps.java | 3 +++ .../schemas/ObjWithRequiredPropsBase.java | 3 +++ .../ObjectModelWithArgAndArgsProperties.java | 3 +++ .../schemas/ObjectModelWithRefProps.java | 3 +++ ...hAllOfWithReqTestPropFromUnsetAddProp.java | 3 +++ .../ObjectWithCollidingProperties.java | 3 +++ .../schemas/ObjectWithDecimalProperties.java | 3 +++ .../ObjectWithDifficultlyNamedProps.java | 3 +++ .../ObjectWithInlineCompositionProperty.java | 3 +++ ...ObjectWithInvalidNamedRefedProperties.java | 3 +++ .../ObjectWithNonIntersectingValues.java | 3 +++ .../schemas/ObjectWithOnlyOptionalProps.java | 3 +++ .../schemas/ObjectWithOptionalTestProp.java | 3 +++ .../components/schemas/Order.java | 3 +++ .../schemas/PaginatedResultMyObjectDto.java | 3 +++ .../components/schemas/Pet.java | 3 +++ .../components/schemas/Player.java | 3 +++ .../components/schemas/PublicKey.java | 3 +++ .../components/schemas/ReadOnlyFirst.java | 3 +++ .../schemas/ReqPropsFromExplicitAddProps.java | 3 +++ .../schemas/ReqPropsFromTrueAddProps.java | 3 +++ .../schemas/ReqPropsFromUnsetAddProps.java | 3 +++ .../components/schemas/ScaleneTriangle.java | 3 +++ .../schemas/SelfReferencingObjectModel.java | 3 +++ .../schemas/SimpleQuadrilateral.java | 3 +++ .../components/schemas/SpecialModelname.java | 3 +++ .../components/schemas/StringBooleanMap.java | 3 +++ .../components/schemas/Tag.java | 3 +++ .../components/schemas/User.java | 3 +++ .../components/schemas/Whale.java | 3 +++ .../components/schemas/Zebra.java | 3 +++ .../delete/HeaderParameters.java | 3 +++ .../delete/PathParameters.java | 3 +++ .../commonparamsubdir/get/PathParameters.java | 3 +++ .../get/QueryParameters.java | 3 +++ .../post/HeaderParameters.java | 3 +++ .../post/PathParameters.java | 3 +++ .../paths/fake/delete/HeaderParameters.java | 3 +++ .../paths/fake/delete/QueryParameters.java | 3 +++ .../paths/fake/get/HeaderParameters.java | 3 +++ .../paths/fake/get/QueryParameters.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../put/QueryParameters.java | 3 +++ .../put/QueryParameters.java | 3 +++ .../delete/PathParameters.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../post/QueryParameters.java | 3 +++ .../post/parameters/parameter1/Schema1.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../fakeobjinquery/get/QueryParameters.java | 3 +++ .../get/parameters/parameter0/Schema0.java | 3 +++ .../post/CookieParameters.java | 3 +++ .../post/HeaderParameters.java | 3 +++ .../post/PathParameters.java | 3 +++ .../post/QueryParameters.java | 3 +++ .../post/PathParameters.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../get/QueryParameters.java | 3 +++ .../get/QueryParameters.java | 3 +++ .../put/QueryParameters.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../petfindbystatus/get/QueryParameters.java | 3 +++ .../petfindbytags/get/QueryParameters.java | 3 +++ .../petpetid/delete/HeaderParameters.java | 3 +++ .../paths/petpetid/delete/PathParameters.java | 3 +++ .../paths/petpetid/get/PathParameters.java | 3 +++ .../paths/petpetid/post/PathParameters.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../post/PathParameters.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../delete/PathParameters.java | 3 +++ .../storeorderorderid/get/PathParameters.java | 3 +++ .../paths/userlogin/get/QueryParameters.java | 3 +++ .../get/responses/response200/Headers.java | 3 +++ .../userusername/delete/PathParameters.java | 3 +++ .../userusername/get/PathParameters.java | 3 +++ .../userusername/put/PathParameters.java | 3 +++ .../schemas/SchemaClass/_Schema_map.hbs | 3 +++ 135 files changed, 447 insertions(+) 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 03c2d7bc445..adfcf060ba8 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 @@ -36,6 +36,9 @@ public class Headers1 implements JsonSchema { new AbstractMap.SimpleEntry>("location", LocationSchema.LocationSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static HeadersMap getMapOutputInstance(FrozenMap arg) { + return new HeadersMap(arg); + } 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/successinlinecontentandheader/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java index 2591b3339ef..f44207ece7c 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 @@ -36,6 +36,9 @@ public class Headers1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", SomeHeaderSchema.SomeHeaderSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static HeadersMap getMapOutputInstance(FrozenMap arg) { + return new HeadersMap(arg); + } 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/successinlinecontentandheader/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java index 32fce172172..9fe7c982c19 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 @@ -28,6 +28,9 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/components/responses/successwithjsonapiresponse/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java index 573c76be765..5e7b7d3b517 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 @@ -49,6 +49,9 @@ public class Headers1 implements JsonSchema { "stringHeader" )); static final Class additionalProperties = AdditionalProperties.class; + public static HeadersMap getMapOutputInstance(FrozenMap arg) { + return new HeadersMap(arg); + } 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/schemas/AbstractStepMessage.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java index 9f5d098f56c..c1d71287c32 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 @@ -45,6 +45,9 @@ public class AbstractStepMessage1 implements JsonSchema { "discriminator", "sequenceNumber" )); + public static AbstractStepMessageMap getMapOutputInstance(FrozenMap arg) { + return new AbstractStepMessageMap(arg); + } 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 812a82d80fd..55dd8304033 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 @@ -33,6 +33,9 @@ public class MapProperty implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static MapPropertyMap getMapOutputInstance(FrozenMap arg) { + return new MapPropertyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapProperty.class, arg, configuration); } @@ -56,6 +59,9 @@ public class AdditionalProperties1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; + public static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + return new AdditionalPropertiesMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties1.class, arg, configuration); } @@ -76,6 +82,9 @@ public class MapOfMapProperty implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; + public static MapOfMapPropertyMap getMapOutputInstance(FrozenMap arg) { + return new MapOfMapPropertyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapOfMapProperty.class, arg, configuration); } @@ -108,6 +117,9 @@ public class MapWithUndeclaredPropertiesAnytype3 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; + public static MapWithUndeclaredPropertiesAnytype3Map getMapOutputInstance(FrozenMap arg) { + return new MapWithUndeclaredPropertiesAnytype3Map(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapWithUndeclaredPropertiesAnytype3.class, arg, configuration); } @@ -133,6 +145,9 @@ public class EmptyMap implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties4.class; + public static EmptyMapMap getMapOutputInstance(FrozenMap arg) { + return new EmptyMapMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(EmptyMap.class, arg, configuration); } @@ -156,6 +171,9 @@ public class MapWithUndeclaredPropertiesString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties5.class; + public static MapWithUndeclaredPropertiesStringMap getMapOutputInstance(FrozenMap arg) { + return new MapWithUndeclaredPropertiesStringMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapWithUndeclaredPropertiesString.class, arg, configuration); } @@ -191,6 +209,9 @@ public class AdditionalPropertiesClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("empty_map", EmptyMap.class), new AbstractMap.SimpleEntry>("map_with_undeclared_properties_string", MapWithUndeclaredPropertiesString.class) )); + public static AdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { + return new AdditionalPropertiesClassMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalPropertiesClass1.class, arg, configuration); } 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 1d092bc8811..20a945550b2 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 @@ -33,6 +33,9 @@ public class Schema0 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static Schema0Map getMapOutputInstance(FrozenMap arg) { + return new Schema0Map(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema0.class, arg, configuration); } @@ -103,6 +106,9 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } @@ -173,6 +179,9 @@ public class Schema2 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; + public static Schema2Map getMapOutputInstance(FrozenMap arg) { + return new Schema2Map(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema2.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 4b6dc1ecdd2..95793db76be 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 @@ -42,6 +42,9 @@ public class AdditionalPropertiesWithArrayOfEnums1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static AdditionalPropertiesWithArrayOfEnumsMap getMapOutputInstance(FrozenMap arg) { + return new AdditionalPropertiesWithArrayOfEnumsMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalPropertiesWithArrayOfEnums1.class, arg, configuration); } 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 9373ba8ef33..989063e0e34 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 @@ -34,6 +34,9 @@ public class Address1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static AddressMap getMapOutputInstance(FrozenMap arg) { + return new AddressMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Address1.class, arg, configuration); } 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 7a66b3aab0b..3e5a6611775 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 @@ -51,6 +51,9 @@ public class Animal1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); + public static AnimalMap getMapOutputInstance(FrozenMap arg) { + return new AnimalMap(arg); + } 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/AnyTypeAndFormat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeAndFormat.java index 84568c94ab0..04045fe8138 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 @@ -506,6 +506,9 @@ public class AnyTypeAndFormat1 implements JsonSchema { new AbstractMap.SimpleEntry>("double", DoubleSchema.class), new AbstractMap.SimpleEntry>("float", FloatSchema.class) )); + public static AnyTypeAndFormatMap getMapOutputInstance(FrozenMap arg) { + return new AnyTypeAndFormatMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeAndFormat1.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 3152e18c722..151403d4232 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 @@ -47,6 +47,9 @@ public class ApiResponseSchema1 implements JsonSchema { new AbstractMap.SimpleEntry>("type", Type.class), new AbstractMap.SimpleEntry>("message", Message.class) )); + public static ApiResponseMap getMapOutputInstance(FrozenMap arg) { + return new ApiResponseMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ApiResponseSchema1.class, arg, 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 85614f9c0d8..cf7be7a9f9f 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 @@ -53,6 +53,9 @@ public class AppleReq1 implements JsonSchema { "cultivar" )); static final Class additionalProperties = AdditionalProperties.class; + public static AppleReqMap getMapOutputInstance(FrozenMap arg) { + return new AppleReqMap(arg); + } 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/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java index a1971823c6b..51243dcd64e 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 @@ -60,6 +60,9 @@ public class ArrayOfArrayOfNumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayArrayNumber", ArrayArrayNumber.class) )); + public static ArrayOfArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { + return new ArrayOfArrayOfNumberOnlyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfArrayOfNumberOnly1.class, arg, configuration); } 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 78ec514087c..6385421d7c6 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 @@ -50,6 +50,9 @@ public class ArrayOfNumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayNumber", ArrayNumber.class) )); + public static ArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { + return new ArrayOfNumberOnlyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfNumberOnly1.class, arg, configuration); } 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 e449f849df4..361ac153f17 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 @@ -96,6 +96,9 @@ public class ArrayTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("array_array_of_integer", ArrayArrayOfInteger.class), new AbstractMap.SimpleEntry>("array_array_of_model", ArrayArrayOfModel.class) )); + public static ArrayTestMap getMapOutputInstance(FrozenMap arg) { + return new ArrayTestMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayTest1.class, arg, configuration); } 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 7fa4e37a8b0..1ac924aa2b0 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 @@ -41,6 +41,9 @@ public class Banana1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "lengthCm" )); + public static BananaMap getMapOutputInstance(FrozenMap arg) { + return new BananaMap(arg); + } 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 f9943212b1d..2724f880b94 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 @@ -53,6 +53,9 @@ public class BananaReq1 implements JsonSchema { "lengthCm" )); static final Class additionalProperties = AdditionalProperties.class; + public static BananaReqMap getMapOutputInstance(FrozenMap arg) { + return new BananaReqMap(arg); + } 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/BasquePig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BasquePig.java index 39c6f2234df..addaddeb7f2 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 @@ -46,6 +46,9 @@ public class BasquePig1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); + public static BasquePigMap getMapOutputInstance(FrozenMap arg) { + return new BasquePigMap(arg); + } 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/Capitalization.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java index 9f174157ac3..a10a67ced1e 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 @@ -58,6 +58,9 @@ public class Capitalization1 implements JsonSchema { new AbstractMap.SimpleEntry>("SCA_ETH_Flow_Points", SCAETHFlowPoints.class), new AbstractMap.SimpleEntry>("ATT_NAME", ATTNAME.class) )); + public static CapitalizationMap getMapOutputInstance(FrozenMap arg) { + return new CapitalizationMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Capitalization1.class, arg, configuration); } 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 ec6b63c95c2..2d54f81f686 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 @@ -37,6 +37,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("declawed", Declawed.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/Category.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Category.java index bdff56b5956..0008a868f03 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 @@ -51,6 +51,9 @@ public class Category1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "name" )); + public static CategoryMap getMapOutputInstance(FrozenMap arg) { + return new CategoryMap(arg); + } 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 24af0a6247d..fb9cc97c780 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 @@ -37,6 +37,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/Client.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Client.java index 47ef5468db4..80a4898f84e 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 @@ -38,6 +38,9 @@ public class Client1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("client", Client2.class) )); + public static ClientMap getMapOutputInstance(FrozenMap arg) { + return new ClientMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Client1.class, arg, configuration); } 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 ba606dd8a60..228005014bc 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 @@ -42,6 +42,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/DanishPig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DanishPig.java index 3245a87a937..6d2fee84de9 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 @@ -46,6 +46,9 @@ public class DanishPig1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); + public static DanishPigMap getMapOutputInstance(FrozenMap arg) { + return new DanishPigMap(arg); + } 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/Dog.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java index 9634763ce32..632a13c1cba 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 @@ -37,6 +37,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("breed", Breed.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/Drawing.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Drawing.java index 12cde513263..2bca68c5fef 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 @@ -50,6 +50,9 @@ public class Drawing1 implements JsonSchema { new AbstractMap.SimpleEntry>("shapes", Shapes.class) )); static final Class additionalProperties = Fruit.Fruit1.class; + public static DrawingMap getMapOutputInstance(FrozenMap arg) { + return new DrawingMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Drawing1.class, arg, configuration); } 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 536c729aeb6..5fdef6106c6 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 @@ -65,6 +65,9 @@ public class EnumArrays1 implements JsonSchema { new AbstractMap.SimpleEntry>("just_symbol", JustSymbol.class), new AbstractMap.SimpleEntry>("array_enum", ArrayEnum.class) )); + public static EnumArraysMap getMapOutputInstance(FrozenMap arg) { + return new EnumArraysMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(EnumArrays1.class, arg, configuration); } 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 72e5af96673..f8f9f512103 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 @@ -101,6 +101,9 @@ public class EnumTest1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "enum_string_required" )); + public static EnumTestMap getMapOutputInstance(FrozenMap arg) { + return new EnumTestMap(arg); + } 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 2b41141bba5..e18352b937e 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 @@ -42,6 +42,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/File.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/File.java index 68e27802ab2..801398ce3f1 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 @@ -40,6 +40,9 @@ public class File1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("sourceURI", SourceURI.class) )); + public static FileMap getMapOutputInstance(FrozenMap arg) { + return new FileMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(File1.class, arg, configuration); } 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 bfd05ff9c67..0d41ed711b2 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 @@ -47,6 +47,9 @@ public class FileSchemaTestClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("file", File.File1.class), new AbstractMap.SimpleEntry>("files", Files.class) )); + public static FileSchemaTestClassMap getMapOutputInstance(FrozenMap arg) { + return new FileSchemaTestClassMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(FileSchemaTestClass1.class, arg, configuration); } 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 916a4018b2f..b3f97fb6e6e 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 @@ -34,6 +34,9 @@ public class Foo1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("bar", Bar.Bar1.class) )); + public static FooMap getMapOutputInstance(FrozenMap arg) { + return new FooMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Foo1.class, arg, configuration); } 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 3fc3ca2da8b..95faaa338da 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 @@ -256,6 +256,9 @@ public class FormatTest1 implements JsonSchema { "number", "password" )); + public static FormatTestMap getMapOutputInstance(FrozenMap arg) { + return new FormatTestMap(arg); + } 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 31aaaabce7e..e36c9fc208a 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 @@ -43,6 +43,9 @@ public class FromSchema1 implements JsonSchema { new AbstractMap.SimpleEntry>("data", Data.class), new AbstractMap.SimpleEntry>("id", Id.class) )); + public static FromSchemaMap getMapOutputInstance(FrozenMap arg) { + return new FromSchemaMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(FromSchema1.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 5bb45125be5..f056e84057f 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 @@ -41,6 +41,9 @@ public class GrandparentAnimal1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "pet_type" )); + public static GrandparentAnimalMap getMapOutputInstance(FrozenMap arg) { + return new GrandparentAnimalMap(arg); + } 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 d393b7891ce..242d2eb6a89 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 @@ -42,6 +42,9 @@ public class HasOnlyReadOnly1 implements JsonSchema { new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("foo", Foo.class) )); + public static HasOnlyReadOnlyMap getMapOutputInstance(FrozenMap arg) { + return new HasOnlyReadOnlyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(HasOnlyReadOnly1.class, arg, configuration); } 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 03ab60e8cad..a9f271c505c 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 @@ -49,6 +49,9 @@ public class HealthCheckResult1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("NullableMessage", NullableMessage.class) )); + public static HealthCheckResultMap getMapOutputInstance(FrozenMap arg) { + return new HealthCheckResultMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(HealthCheckResult1.class, arg, configuration); } 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 85bbfe9897c..1e1e150c32a 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 @@ -42,6 +42,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/JSONPatchRequestAddReplaceTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestAddReplaceTest.java index 92a04b086e7..e51fb2d0dce 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 @@ -64,6 +64,9 @@ public class JSONPatchRequestAddReplaceTest1 implements JsonSchema { "value" )); static final Class additionalProperties = AdditionalProperties.class; + public static JSONPatchRequestAddReplaceTestMap getMapOutputInstance(FrozenMap arg) { + return new JSONPatchRequestAddReplaceTestMap(arg); + } 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 14a4587e2a8..468086dbf6b 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 @@ -64,6 +64,9 @@ public class JSONPatchRequestMoveCopy1 implements JsonSchema { "path" )); static final Class additionalProperties = AdditionalProperties.class; + public static JSONPatchRequestMoveCopyMap getMapOutputInstance(FrozenMap arg) { + return new JSONPatchRequestMoveCopyMap(arg); + } 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 973c4f098e5..859578eccc4 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 @@ -59,6 +59,9 @@ public class JSONPatchRequestRemove1 implements JsonSchema { "path" )); static final Class additionalProperties = AdditionalProperties.class; + public static JSONPatchRequestRemoveMap getMapOutputInstance(FrozenMap arg) { + return new JSONPatchRequestRemoveMap(arg); + } 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/MapTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java index ff18f9644b0..e83c8b7647d 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 @@ -31,6 +31,9 @@ public class AdditionalProperties implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; + public static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + return new AdditionalPropertiesMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties.class, arg, configuration); } @@ -51,6 +54,9 @@ public class MapMapOfString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static MapMapOfStringMap getMapOutputInstance(FrozenMap arg) { + return new MapMapOfStringMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapMapOfString.class, arg, configuration); } @@ -80,6 +86,9 @@ public class MapOfEnumString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; + public static MapOfEnumStringMap getMapOutputInstance(FrozenMap arg) { + return new MapOfEnumStringMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapOfEnumString.class, arg, configuration); } @@ -103,6 +112,9 @@ public class DirectMap implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; + public static DirectMapMap getMapOutputInstance(FrozenMap arg) { + return new DirectMapMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(DirectMap.class, arg, configuration); } @@ -134,6 +146,9 @@ public class MapTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("direct_map", DirectMap.class), new AbstractMap.SimpleEntry>("indirect_map", StringBooleanMap.StringBooleanMap1.class) )); + public static MapTestMap getMapOutputInstance(FrozenMap arg) { + return new MapTestMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapTest1.class, arg, configuration); } 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 5e24c0b2703..1f72ffba4d0 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 @@ -34,6 +34,9 @@ public class MapSchema implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = Animal.Animal1.class; + public static MapMap getMapOutputInstance(FrozenMap arg) { + return new MapMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapSchema.class, arg, configuration); } @@ -64,6 +67,9 @@ public class MixedPropertiesAndAdditionalPropertiesClass1 implements JsonSchema new AbstractMap.SimpleEntry>("dateTime", DateTime.class), new AbstractMap.SimpleEntry>("map", MapSchema.class) )); + public static MixedPropertiesAndAdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { + return new MixedPropertiesAndAdditionalPropertiesClassMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MixedPropertiesAndAdditionalPropertiesClass1.class, arg, configuration); } 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 3bba723e647..27905d38b92 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 @@ -50,6 +50,9 @@ public class Money1 implements JsonSchema { "currency" )); static final Class additionalProperties = AdditionalProperties.class; + public static MoneyMap getMapOutputInstance(FrozenMap arg) { + return new MoneyMap(arg); + } 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 fe412e82058..4c764765baa 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 @@ -45,6 +45,9 @@ public class MyObjectDto1 implements JsonSchema { new AbstractMap.SimpleEntry>("id", Id.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static MyObjectDtoMap getMapOutputInstance(FrozenMap arg) { + return new MyObjectDtoMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MyObjectDto1.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 7bf90ace3e8..147c98195e1 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 @@ -52,6 +52,9 @@ public class NoAdditionalProperties1 implements JsonSchema { "id" )); static final Class additionalProperties = AdditionalProperties.class; + public static NoAdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + return new NoAdditionalPropertiesMap(arg); + } 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 7caa1a89034..c116db40211 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 @@ -296,6 +296,9 @@ public class ObjectItemsNullable implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; + public static ObjectItemsNullableMap getMapOutputInstance(FrozenMap arg) { + return new ObjectItemsNullableMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectItemsNullable.class, arg, configuration); } @@ -336,6 +339,9 @@ public class NullableClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("object_items_nullable", ObjectItemsNullable.class) )); static final Class additionalProperties = AdditionalProperties3.class; + public static NullableClassMap getMapOutputInstance(FrozenMap arg) { + return new NullableClassMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(NullableClass1.class, arg, configuration); } 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 e9c46142b75..836b83a5df4 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 @@ -38,6 +38,9 @@ public class NumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("JustNumber", JustNumber.class) )); + public static NumberOnlyMap getMapOutputInstance(FrozenMap arg) { + return new NumberOnlyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(NumberOnly1.class, arg, configuration); } 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 dbaa856b2a8..af670099c64 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 @@ -41,6 +41,9 @@ public class ObjWithRequiredProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "a" )); + public static ObjWithRequiredPropsMap getMapOutputInstance(FrozenMap arg) { + return new ObjWithRequiredPropsMap(arg); + } 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 dee0ad81c3b..f98fe5a83a2 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 @@ -41,6 +41,9 @@ public class ObjWithRequiredPropsBase1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "b" )); + public static ObjWithRequiredPropsBaseMap getMapOutputInstance(FrozenMap arg) { + return new ObjWithRequiredPropsBaseMap(arg); + } 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/ObjectModelWithArgAndArgsProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java index 96edb20b8c5..b0c9db18148 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 @@ -46,6 +46,9 @@ public class ObjectModelWithArgAndArgsProperties1 implements JsonSchema { "arg", "args" )); + public static ObjectModelWithArgAndArgsPropertiesMap getMapOutputInstance(FrozenMap arg) { + return new ObjectModelWithArgAndArgsPropertiesMap(arg); + } 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 db8403eae79..980a2d78f0b 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 @@ -38,6 +38,9 @@ a model that includes properties which should stay primitive (String + Boolean) new AbstractMap.SimpleEntry>("myString", StringSchema.StringSchema1.class), new AbstractMap.SimpleEntry>("myBoolean", BooleanSchema.BooleanSchema1.class) )); + public static ObjectModelWithRefPropsMap getMapOutputInstance(FrozenMap arg) { + return new ObjectModelWithRefPropsMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectModelWithRefProps1.class, arg, configuration); } 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 be7d873450e..e11af169939 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 @@ -40,6 +40,9 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "test" )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/ObjectWithCollidingProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithCollidingProperties.java index c353b6666dd..09ad3770990 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 @@ -44,6 +44,9 @@ public class ObjectWithCollidingProperties1 implements JsonSchema { new AbstractMap.SimpleEntry>("someProp", SomeProp.class), new AbstractMap.SimpleEntry>("someprop", Someprop.class) )); + public static ObjectWithCollidingPropertiesMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithCollidingPropertiesMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithCollidingProperties1.class, arg, configuration); } 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 aebebbef820..77466ca7766 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 @@ -40,6 +40,9 @@ public class ObjectWithDecimalProperties1 implements JsonSchema { new AbstractMap.SimpleEntry>("width", Width.class), new AbstractMap.SimpleEntry>("cost", Money.Money1.class) )); + public static ObjectWithDecimalPropertiesMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithDecimalPropertiesMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithDecimalProperties1.class, arg, configuration); } 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 7c6d6f24808..48d42f78871 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 @@ -53,6 +53,9 @@ public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "123-list" )); + public static ObjectWithDifficultlyNamedPropsMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithDifficultlyNamedPropsMap(arg); + } 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 4ebfb5112a4..ce96e99fc28 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 @@ -98,6 +98,9 @@ public class ObjectWithInlineCompositionProperty1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); + public static ObjectWithInlineCompositionPropertyMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithInlineCompositionPropertyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithInlineCompositionProperty1.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 78152df1275..13a938d0323 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 @@ -39,6 +39,9 @@ public class ObjectWithInvalidNamedRefedProperties1 implements JsonSchema { "!reference", "from" )); + public static ObjectWithInvalidNamedRefedPropertiesMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithInvalidNamedRefedPropertiesMap(arg); + } 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 67bea92e978..b89f2e2d42d 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 @@ -43,6 +43,9 @@ public class ObjectWithNonIntersectingValues1 implements JsonSchema { new AbstractMap.SimpleEntry>("a", A.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static ObjectWithNonIntersectingValuesMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithNonIntersectingValuesMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithNonIntersectingValues1.class, arg, configuration); } 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 9597466f52b..4eeddd15615 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 @@ -50,6 +50,9 @@ public class ObjectWithOnlyOptionalProps1 implements JsonSchema { new AbstractMap.SimpleEntry>("b", B.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static ObjectWithOnlyOptionalPropsMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithOnlyOptionalPropsMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithOnlyOptionalProps1.class, arg, configuration); } 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 b5ca83e74f5..eab2eb4eb37 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 @@ -38,6 +38,9 @@ public class ObjectWithOptionalTestProp1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("test", Test.class) )); + public static ObjectWithOptionalTestPropMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithOptionalTestPropMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithOptionalTestProp1.class, arg, configuration); } 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 f36acf6b6c3..1fc40d99393 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 @@ -67,6 +67,9 @@ public class Order1 implements JsonSchema { new AbstractMap.SimpleEntry>("status", Status.class), new AbstractMap.SimpleEntry>("complete", Complete.class) )); + public static OrderMap getMapOutputInstance(FrozenMap arg) { + return new OrderMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Order1.class, arg, configuration); } 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 049f726aa25..8867de9b43e 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 @@ -62,6 +62,9 @@ public class PaginatedResultMyObjectDto1 implements JsonSchema { "results" )); static final Class additionalProperties = AdditionalProperties.class; + public static PaginatedResultMyObjectDtoMap getMapOutputInstance(FrozenMap arg) { + return new PaginatedResultMyObjectDtoMap(arg); + } 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/Pet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pet.java index c365a9c4131..866923d9192 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 @@ -87,6 +87,9 @@ public class Pet1 implements JsonSchema { "name", "photoUrls" )); + public static PetMap getMapOutputInstance(FrozenMap arg) { + return new PetMap(arg); + } 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/Player.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java index 4419fd904de..bc893cdc173 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 @@ -41,6 +41,9 @@ public class Player1 implements JsonSchema { new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("enemyPlayer", Player1.class) )); + public static PlayerMap getMapOutputInstance(FrozenMap arg) { + return new PlayerMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Player1.class, arg, configuration); } 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 7cc5f4b2db5..6f013ebe20c 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 @@ -40,6 +40,9 @@ public class PublicKey1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("key", Key.class) )); + public static PublicKeyMap getMapOutputInstance(FrozenMap arg) { + return new PublicKeyMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PublicKey1.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 625d6dd1f90..75e9765d9c6 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 @@ -42,6 +42,9 @@ public class ReadOnlyFirst1 implements JsonSchema { new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("baz", Baz.class) )); + public static ReadOnlyFirstMap getMapOutputInstance(FrozenMap arg) { + return new ReadOnlyFirstMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ReadOnlyFirst1.class, arg, configuration); } 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 df39a1c4c52..b9c53fab458 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 @@ -38,6 +38,9 @@ public class ReqPropsFromExplicitAddProps1 implements JsonSchema { "validName" )); static final Class additionalProperties = AdditionalProperties.class; + public static ReqPropsFromExplicitAddPropsMap getMapOutputInstance(FrozenMap arg) { + return new ReqPropsFromExplicitAddPropsMap(arg); + } 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 b9956603ed7..5c75c8f4d03 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 @@ -38,6 +38,9 @@ public class ReqPropsFromTrueAddProps1 implements JsonSchema { "validName" )); static final Class additionalProperties = AdditionalProperties.class; + public static ReqPropsFromTrueAddPropsMap getMapOutputInstance(FrozenMap arg) { + return new ReqPropsFromTrueAddPropsMap(arg); + } 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 776e2748685..5873d98731f 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 @@ -33,6 +33,9 @@ public class ReqPropsFromUnsetAddProps1 implements JsonSchema { "invalid-name", "validName" )); + public static ReqPropsFromUnsetAddPropsMap getMapOutputInstance(FrozenMap arg) { + return new ReqPropsFromUnsetAddPropsMap(arg); + } 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/ScaleneTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java index f4ae6062f5b..0adf1c47881 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 @@ -42,6 +42,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/SelfReferencingObjectModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingObjectModel.java index 837e0dda484..d638f065c36 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 @@ -35,6 +35,9 @@ public class SelfReferencingObjectModel1 implements JsonSchema { new AbstractMap.SimpleEntry>("selfRef", SelfReferencingObjectModel1.class) )); static final Class additionalProperties = SelfReferencingObjectModel1.class; + public static SelfReferencingObjectModelMap getMapOutputInstance(FrozenMap arg) { + return new SelfReferencingObjectModelMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SelfReferencingObjectModel1.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 69e80f9f969..5be1b2765cb 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 @@ -42,6 +42,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); + public static Schema1Map getMapOutputInstance(FrozenMap arg) { + return new Schema1Map(arg); + } 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/components/schemas/SpecialModelname.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SpecialModelname.java index b9c196d2c16..93bdaa94f2a 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 @@ -40,6 +40,9 @@ model with an invalid class name for python static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); + public static SpecialModelnameMap getMapOutputInstance(FrozenMap arg) { + return new SpecialModelnameMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SpecialModelname1.class, arg, configuration); } 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 d4fd9286d7f..2b87950ec43 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 @@ -34,6 +34,9 @@ public class StringBooleanMap1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static StringBooleanMapMap getMapOutputInstance(FrozenMap arg) { + return new StringBooleanMapMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(StringBooleanMap1.class, arg, configuration); } 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 0b9478615ef..4d9ca186efe 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 @@ -43,6 +43,9 @@ public class Tag1 implements JsonSchema { new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("name", Name.class) )); + public static TagMap getMapOutputInstance(FrozenMap arg) { + return new TagMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Tag1.class, arg, configuration); } 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 c11c0880e1a..0f3b43c84d7 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 @@ -156,6 +156,9 @@ public class User1 implements JsonSchema { new AbstractMap.SimpleEntry>("anyTypeExceptNullProp", AnyTypeExceptNullProp.class), new AbstractMap.SimpleEntry>("anyTypePropNullable", AnyTypePropNullable.class) )); + public static UserMap getMapOutputInstance(FrozenMap arg) { + return new UserMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(User1.class, arg, configuration); } 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 5aad18e337a..ce20ac445d3 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 @@ -55,6 +55,9 @@ public class Whale1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); + public static WhaleMap getMapOutputInstance(FrozenMap arg) { + return new WhaleMap(arg); + } 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 ed0be8cb887..68858321717 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 @@ -61,6 +61,9 @@ public class Zebra1 implements JsonSchema { "className" )); static final Class additionalProperties = AdditionalProperties.class; + public static ZebraMap getMapOutputInstance(FrozenMap arg) { + return new ZebraMap(arg); + } 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/commonparamsubdir/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java index c4927dd24b2..29fc4b08237 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 @@ -36,6 +36,9 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + return new HeaderParametersMap(arg); + } 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/commonparamsubdir/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java index 5919f5e268e..e7ae058afa5 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/PathParameters.java index bb0a3448a01..856fe801ac4 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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 1e01fd1c7d6..d1eb39efdc9 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 @@ -36,6 +36,9 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("searchStr", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/commonparamsubdir/post/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/HeaderParameters.java index d00deb7d76d..89dc18e5ea6 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 @@ -36,6 +36,9 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + return new HeaderParametersMap(arg); + } 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/commonparamsubdir/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/PathParameters.java index c134c2add67..d9d20272179 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/fake/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/HeaderParameters.java index a9d163525c4..0cc9ca8d3d2 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 @@ -41,6 +41,9 @@ public class HeaderParameters1 implements JsonSchema { "required_boolean_group" )); static final Class additionalProperties = AdditionalProperties.class; + public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + return new HeaderParametersMap(arg); + } 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 af979e88f97..bc6a1fbc4c7 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 @@ -46,6 +46,9 @@ public class QueryParameters1 implements JsonSchema { "required_string_group" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/get/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/HeaderParameters.java index 848d2381131..59eb856fca5 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 @@ -38,6 +38,9 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_header_string_array", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + return new HeaderParametersMap(arg); + } 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/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/QueryParameters.java index 909c5b0232e..5a59b9b8bca 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 @@ -42,6 +42,9 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_query_string_array", Schema2.Schema21.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/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 b98674baf4b..9f5bfd9bf43 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 @@ -59,6 +59,9 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_form_string_array", EnumFormStringArray.class), new AbstractMap.SimpleEntry>("enum_form_string", EnumFormString.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/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 c63392ed81d..d0b60442ee0 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 @@ -205,6 +205,9 @@ public class Schema1 implements JsonSchema { "number", "pattern_without_delimiter" )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/fakebodywithqueryparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/QueryParameters.java index edebcd93e77..5e9c6d1d5b7 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 @@ -39,6 +39,9 @@ public class QueryParameters1 implements JsonSchema { "query" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/QueryParameters.java index 330e57f9b7b..d8a784901b0 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 @@ -45,6 +45,9 @@ public class QueryParameters1 implements JsonSchema { "some_var" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/fakedeletecoffeeid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/PathParameters.java index 04d0d38fbbd..a4a35e2f4cf 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "id" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/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 e78c1162df9..b53a2dbc471 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 @@ -28,6 +28,9 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/QueryParameters.java index a1ae8445f8d..bf245d7af1f 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 @@ -38,6 +38,9 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("compositionInProperty", Schema1.Schema11.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/fakeinlinecomposition/post/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java index df1fc6458e4..a0447cd0821 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 @@ -92,6 +92,9 @@ public class Schema11 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp1.class) )); + public static SchemaMap1 getMapOutputInstance(FrozenMap arg) { + return new SchemaMap1(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema11.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 6cda6543768..8858e4e27b2 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 @@ -92,6 +92,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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 b915787f074..3d7f5193a86 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 @@ -92,6 +92,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/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 30c4c506e38..b61a0aec6c5 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 @@ -40,6 +40,9 @@ public class Schema1 implements JsonSchema { "param", "param2" )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/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 5dfa5095105..098835d2356 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 @@ -32,6 +32,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/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 38e7c094224..3f72e0918bf 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 @@ -32,6 +32,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("b", B.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/fakeobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/QueryParameters.java index e377a43858f..41605a5286f 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 @@ -36,6 +36,9 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("mapBean", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/fakeobjinquery/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java index 4b7f930fba2..ec4dd497930 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 @@ -32,6 +32,9 @@ public class Schema01 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("keyword", Keyword0.class) )); + public static SchemaMap0 getMapOutputInstance(FrozenMap arg) { + return new SchemaMap0(arg); + } 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/fakeparametercollisions1ababselfab/post/CookieParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java index 077f03730f6..8827b435407 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 @@ -44,6 +44,9 @@ public class CookieParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema17.Schema171.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static CookieParametersMap getMapOutputInstance(FrozenMap arg) { + return new CookieParametersMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(CookieParameters1.class, arg, configuration); } 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 0bb04604a90..7b79189a002 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 @@ -42,6 +42,9 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema7.Schema71.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + return new HeaderParametersMap(arg); + } 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/fakeparametercollisions1ababselfab/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/PathParameters.java index 1e8810b5ade..6a3c51899d0 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 @@ -51,6 +51,9 @@ public class PathParameters1 implements JsonSchema { "self" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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 b742a8d2c54..c8c758c92fe 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 @@ -44,6 +44,9 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema3.Schema31.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/fakepetiduploadimagewithrequiredfile/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java index fbd4a1d007e..2f93fc64aa1 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java index f7b91ae4d3f..af364246225 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 @@ -41,6 +41,9 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "requiredFile" )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/fakequeryparamwithjsoncontenttype/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java index 2ddc8f3427a..230a46238e2 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 @@ -39,6 +39,9 @@ public class QueryParameters1 implements JsonSchema { "someParam" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/fakerefobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/QueryParameters.java index 8e68a923222..0640049669e 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 @@ -36,6 +36,9 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("mapBean", Foo.Foo1.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/QueryParameters.java index bcb3fe203bd..71daf275109 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 @@ -54,6 +54,9 @@ public class QueryParameters1 implements JsonSchema { "url" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/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 e6b8602b84b..66632065fc3 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 @@ -41,6 +41,9 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "file" )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/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 8079148a1a0..e5c745fb6f0 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 @@ -45,6 +45,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("files", Files.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/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 a0ca8b5ff00..febc70621fd 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 @@ -29,6 +29,9 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("string", Foo.Foo1.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/petfindbystatus/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/QueryParameters.java index af7183fb903..0e70fee9b6f 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 @@ -39,6 +39,9 @@ public class QueryParameters1 implements JsonSchema { "status" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/QueryParameters.java index f5ba41aec92..d43eb8007b9 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 @@ -39,6 +39,9 @@ public class QueryParameters1 implements JsonSchema { "tags" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/petpetid/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/HeaderParameters.java index f639bd99a1d..5c658a48a76 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 @@ -36,6 +36,9 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("api_key", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; + public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + return new HeaderParametersMap(arg); + } 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/petpetid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/PathParameters.java index 67de35e1814..c4b430a5591 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/PathParameters.java index 936f11e6919..19f300270d3 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/PathParameters.java index a2b5974cfbf..7ebf0ce2a39 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java index 82bc0bab115..022c8cb86e7 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 @@ -36,6 +36,9 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("status", Status.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/petpetiduploadimage/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/PathParameters.java index ee529037012..e5c5e4e95b7 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java index 09f06bbf05d..ef1337d957f 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 @@ -38,6 +38,9 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("additionalMetadata", AdditionalMetadata.class), new AbstractMap.SimpleEntry>("file", File.class) )); + public static SchemaMap getMapOutputInstance(FrozenMap arg) { + return new SchemaMap(arg); + } 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/storeorderorderid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/PathParameters.java index 6f32197b600..825e3a8a2aa 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "order_id" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/PathParameters.java index c21dc029f85..7f515e592d9 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "order_id" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/userlogin/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/QueryParameters.java index 5098a2c7dc8..917c57d5770 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 @@ -42,6 +42,9 @@ public class QueryParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; + public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + return new QueryParametersMap(arg); + } 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/responses/response200/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/Headers.java index edd8947c7df..1cfbc8b15a6 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 @@ -49,6 +49,9 @@ public class Headers1 implements JsonSchema { "ref-content-schema-header" )); static final Class additionalProperties = AdditionalProperties.class; + public static HeadersMap getMapOutputInstance(FrozenMap arg) { + return new HeadersMap(arg); + } 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/userusername/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/delete/PathParameters.java index 8019a318a2c..8ff74704c46 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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 db9213d030b..b3f0726510a 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java index 7c1760282a6..49ff034f0c1 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 @@ -39,6 +39,9 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; + public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + return new PathParametersMap(arg); + } public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs index 02dd9080963..c1b93453bad 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs @@ -69,6 +69,9 @@ public class {{jsonPathPiece.camelCase}} implements JsonSchema { {{!> components/schemas/schema_cls/_unevaluated_properties }} {{/if}} {{#if mapOutputJsonPathPiece}} + public static {{mapOutputJsonPathPiece.camelCase}} getMapOutputInstance(FrozenMap arg) { + return new {{mapOutputJsonPathPiece.camelCase}}(arg); + } {{/if}} {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_validate }} } From 571b5a62601b8a441017ca26cf2ea38b8a1e725e Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sat, 18 Nov 2023 19:32:35 -0800 Subject: [PATCH 04/15] Makes getMapOutputInstance non-public --- .../responses/headerswithnobody/Headers.java | 4 +-- .../Headers.java | 4 +-- .../content/applicationjson/Schema.java | 4 +-- .../successwithjsonapiresponse/Headers.java | 4 +-- .../schemas/AbstractStepMessage.java | 4 +-- .../schemas/AdditionalPropertiesClass.java | 28 +++++++++---------- .../AdditionalPropertiesValidator.java | 12 ++++---- .../AdditionalPropertiesWithArrayOfEnums.java | 4 +-- .../components/schemas/Address.java | 4 +-- .../components/schemas/Animal.java | 4 +-- .../components/schemas/AnyTypeAndFormat.java | 4 +-- .../components/schemas/ApiResponseSchema.java | 4 +-- .../components/schemas/Apple.java | 2 +- .../components/schemas/AppleReq.java | 4 +-- .../schemas/ArrayOfArrayOfNumberOnly.java | 4 +-- .../components/schemas/ArrayOfNumberOnly.java | 4 +-- .../components/schemas/ArrayTest.java | 4 +-- .../components/schemas/Banana.java | 4 +-- .../components/schemas/BananaReq.java | 4 +-- .../components/schemas/BasquePig.java | 4 +-- .../components/schemas/Capitalization.java | 4 +-- .../components/schemas/Cat.java | 4 +-- .../components/schemas/Category.java | 4 +-- .../components/schemas/ChildCat.java | 4 +-- .../components/schemas/ClassModel.java | 2 +- .../components/schemas/Client.java | 4 +-- .../schemas/ComplexQuadrilateral.java | 4 +-- .../components/schemas/DanishPig.java | 4 +-- .../components/schemas/Dog.java | 4 +-- .../components/schemas/Drawing.java | 4 +-- .../components/schemas/EnumArrays.java | 4 +-- .../components/schemas/EnumTest.java | 4 +-- .../schemas/EquilateralTriangle.java | 4 +-- .../components/schemas/File.java | 4 +-- .../schemas/FileSchemaTestClass.java | 4 +-- .../components/schemas/Foo.java | 4 +-- .../components/schemas/FormatTest.java | 4 +-- .../components/schemas/FromSchema.java | 4 +-- .../components/schemas/Fruit.java | 2 +- .../components/schemas/GmFruit.java | 2 +- .../components/schemas/GrandparentAnimal.java | 4 +-- .../components/schemas/HasOnlyReadOnly.java | 4 +-- .../components/schemas/HealthCheckResult.java | 4 +-- .../components/schemas/IsoscelesTriangle.java | 4 +-- .../JSONPatchRequestAddReplaceTest.java | 4 +-- .../schemas/JSONPatchRequestMoveCopy.java | 4 +-- .../schemas/JSONPatchRequestRemove.java | 4 +-- .../components/schemas/MapTest.java | 20 ++++++------- ...ropertiesAndAdditionalPropertiesClass.java | 8 +++--- .../components/schemas/Money.java | 4 +-- .../components/schemas/MyObjectDto.java | 4 +-- .../components/schemas/Name.java | 2 +- .../schemas/NoAdditionalProperties.java | 4 +-- .../components/schemas/NullableClass.java | 12 ++++---- .../components/schemas/NumberOnly.java | 4 +-- .../schemas/ObjWithRequiredProps.java | 4 +-- .../schemas/ObjWithRequiredPropsBase.java | 4 +-- .../ObjectModelWithArgAndArgsProperties.java | 4 +-- .../schemas/ObjectModelWithRefProps.java | 4 +-- ...hAllOfWithReqTestPropFromUnsetAddProp.java | 4 +-- .../ObjectWithCollidingProperties.java | 4 +-- .../schemas/ObjectWithDecimalProperties.java | 4 +-- .../ObjectWithDifficultlyNamedProps.java | 4 +-- .../ObjectWithInlineCompositionProperty.java | 4 +-- ...ObjectWithInvalidNamedRefedProperties.java | 4 +-- .../ObjectWithNonIntersectingValues.java | 4 +-- .../schemas/ObjectWithOnlyOptionalProps.java | 4 +-- .../schemas/ObjectWithOptionalTestProp.java | 4 +-- .../components/schemas/Order.java | 4 +-- .../schemas/PaginatedResultMyObjectDto.java | 4 +-- .../components/schemas/Pet.java | 4 +-- .../components/schemas/Player.java | 4 +-- .../components/schemas/PublicKey.java | 4 +-- .../schemas/QuadrilateralInterface.java | 2 +- .../components/schemas/ReadOnlyFirst.java | 4 +-- .../schemas/ReqPropsFromExplicitAddProps.java | 4 +-- .../schemas/ReqPropsFromTrueAddProps.java | 4 +-- .../schemas/ReqPropsFromUnsetAddProps.java | 4 +-- .../components/schemas/ReturnSchema.java | 2 +- .../components/schemas/ScaleneTriangle.java | 4 +-- .../components/schemas/Schema200Response.java | 2 +- .../schemas/SelfReferencingObjectModel.java | 4 +-- .../schemas/SimpleQuadrilateral.java | 4 +-- .../components/schemas/SpecialModelname.java | 4 +-- .../components/schemas/StringBooleanMap.java | 4 +-- .../components/schemas/Tag.java | 4 +-- .../components/schemas/TriangleInterface.java | 2 +- .../components/schemas/User.java | 4 +-- .../components/schemas/Whale.java | 4 +-- .../components/schemas/Zebra.java | 4 +-- .../delete/HeaderParameters.java | 4 +-- .../delete/PathParameters.java | 4 +-- .../commonparamsubdir/get/PathParameters.java | 4 +-- .../get/QueryParameters.java | 4 +-- .../post/HeaderParameters.java | 4 +-- .../post/PathParameters.java | 4 +-- .../paths/fake/delete/HeaderParameters.java | 4 +-- .../paths/fake/delete/QueryParameters.java | 4 +-- .../paths/fake/get/HeaderParameters.java | 4 +-- .../paths/fake/get/QueryParameters.java | 4 +-- .../applicationxwwwformurlencoded/Schema.java | 4 +-- .../applicationxwwwformurlencoded/Schema.java | 4 +-- .../put/QueryParameters.java | 4 +-- .../put/QueryParameters.java | 4 +-- .../delete/PathParameters.java | 4 +-- .../content/applicationjson/Schema.java | 4 +-- .../post/QueryParameters.java | 4 +-- .../post/parameters/parameter1/Schema1.java | 4 +-- .../content/multipartformdata/Schema.java | 4 +-- .../content/multipartformdata/Schema.java | 4 +-- .../applicationxwwwformurlencoded/Schema.java | 4 +-- .../content/applicationjson/Schema.java | 4 +-- .../content/multipartformdata/Schema.java | 4 +-- .../fakeobjinquery/get/QueryParameters.java | 4 +-- .../get/parameters/parameter0/Schema0.java | 4 +-- .../post/CookieParameters.java | 4 +-- .../post/HeaderParameters.java | 4 +-- .../post/PathParameters.java | 4 +-- .../post/QueryParameters.java | 4 +-- .../post/PathParameters.java | 4 +-- .../content/multipartformdata/Schema.java | 4 +-- .../get/QueryParameters.java | 4 +-- .../get/QueryParameters.java | 4 +-- .../put/QueryParameters.java | 4 +-- .../content/multipartformdata/Schema.java | 4 +-- .../content/multipartformdata/Schema.java | 4 +-- .../content/applicationjson/Schema.java | 4 +-- .../petfindbystatus/get/QueryParameters.java | 4 +-- .../petfindbytags/get/QueryParameters.java | 4 +-- .../petpetid/delete/HeaderParameters.java | 4 +-- .../paths/petpetid/delete/PathParameters.java | 4 +-- .../paths/petpetid/get/PathParameters.java | 4 +-- .../paths/petpetid/post/PathParameters.java | 4 +-- .../applicationxwwwformurlencoded/Schema.java | 4 +-- .../post/PathParameters.java | 4 +-- .../content/multipartformdata/Schema.java | 4 +-- .../delete/PathParameters.java | 4 +-- .../storeorderorderid/get/PathParameters.java | 4 +-- .../paths/userlogin/get/QueryParameters.java | 4 +-- .../get/responses/response200/Headers.java | 4 +-- .../userusername/delete/PathParameters.java | 4 +-- .../userusername/get/PathParameters.java | 4 +-- .../userusername/put/PathParameters.java | 4 +-- .../schemas/JsonSchema.java | 4 +-- .../schemas/ObjectTypeSchemaTest.java | 20 ++++++------- .../schemas/SchemaClass/_Schema_map.hbs | 2 +- .../components/schemas/_objectOutputType.hbs | 6 ++-- .../org/openapitools/schemas/JsonSchema.hbs | 4 +-- .../schemas/ObjectTypeSchemaTest.hbs | 20 ++++++------- 149 files changed, 335 insertions(+), 335 deletions(-) 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 adfcf060ba8..a69700dc2d3 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeadersMap extends FrozenMap { + public static class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class Headers1 implements JsonSchema { new AbstractMap.SimpleEntry>("location", LocationSchema.LocationSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static HeadersMap getMapOutputInstance(FrozenMap arg) { + static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 f44207ece7c..3bff46a7d28 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeadersMap extends FrozenMap { + public static class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class Headers1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", SomeHeaderSchema.SomeHeaderSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static HeadersMap getMapOutputInstance(FrozenMap arg) { + static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 9fe7c982c19..32c71ed39fd 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 @@ -14,7 +14,7 @@ public class Schema { public class AdditionalProperties extends Int32JsonSchema {} - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -28,7 +28,7 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5e7b7d3b517..95f977e16da 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 @@ -22,7 +22,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeadersMap extends FrozenMap { + public static class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } @@ -49,7 +49,7 @@ public class Headers1 implements JsonSchema { "stringHeader" )); static final Class additionalProperties = AdditionalProperties.class; - public static HeadersMap getMapOutputInstance(FrozenMap arg) { + static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 c1d71287c32..71090d970a4 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 @@ -16,7 +16,7 @@ public class AbstractStepMessage { public class Discriminator extends StringJsonSchema {} - class AbstractStepMessageMap extends FrozenMap { + public static class AbstractStepMessageMap extends FrozenMap { AbstractStepMessageMap(FrozenMap m) { super(m); } @@ -45,7 +45,7 @@ public class AbstractStepMessage1 implements JsonSchema { "discriminator", "sequenceNumber" )); - public static AbstractStepMessageMap getMapOutputInstance(FrozenMap arg) { + static AbstractStepMessageMap getMapOutputInstance(FrozenMap arg) { return new AbstractStepMessageMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 55dd8304033..2dc4cb7d626 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 @@ -19,7 +19,7 @@ public class AdditionalPropertiesClass { public class AdditionalProperties extends StringJsonSchema {} - class MapPropertyMap extends FrozenMap { + public static class MapPropertyMap extends FrozenMap { MapPropertyMap(FrozenMap m) { super(m); } @@ -33,7 +33,7 @@ public class MapProperty implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static MapPropertyMap getMapOutputInstance(FrozenMap arg) { + static MapPropertyMap getMapOutputInstance(FrozenMap arg) { return new MapPropertyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -45,7 +45,7 @@ public static T validate(Map arg, SchemaCo public class AdditionalProperties2 extends StringJsonSchema {} - class AdditionalPropertiesMap extends FrozenMap { + public static class AdditionalPropertiesMap extends FrozenMap { AdditionalPropertiesMap(FrozenMap m) { super(m); } @@ -59,7 +59,7 @@ public class AdditionalProperties1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - public static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -68,7 +68,7 @@ public static T validate(Map arg, SchemaCo } - class MapOfMapPropertyMap extends FrozenMap { + public static class MapOfMapPropertyMap extends FrozenMap { MapOfMapPropertyMap(FrozenMap m) { super(m); } @@ -82,7 +82,7 @@ public class MapOfMapProperty implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; - public static MapOfMapPropertyMap getMapOutputInstance(FrozenMap arg) { + static MapOfMapPropertyMap getMapOutputInstance(FrozenMap arg) { return new MapOfMapPropertyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -103,7 +103,7 @@ public class MapWithUndeclaredPropertiesAnytype2 extends MapJsonSchema {} public class AdditionalProperties3 extends AnyTypeJsonSchema {} - class MapWithUndeclaredPropertiesAnytype3Map extends FrozenMap { + public static class MapWithUndeclaredPropertiesAnytype3Map extends FrozenMap { MapWithUndeclaredPropertiesAnytype3Map(FrozenMap m) { super(m); } @@ -117,7 +117,7 @@ public class MapWithUndeclaredPropertiesAnytype3 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; - public static MapWithUndeclaredPropertiesAnytype3Map getMapOutputInstance(FrozenMap arg) { + static MapWithUndeclaredPropertiesAnytype3Map getMapOutputInstance(FrozenMap arg) { return new MapWithUndeclaredPropertiesAnytype3Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -130,7 +130,7 @@ public class AdditionalProperties4 extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class EmptyMapMap extends FrozenMap { + public static class EmptyMapMap extends FrozenMap { EmptyMapMap(FrozenMap m) { super(m); } @@ -145,7 +145,7 @@ public class EmptyMap implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties4.class; - public static EmptyMapMap getMapOutputInstance(FrozenMap arg) { + static EmptyMapMap getMapOutputInstance(FrozenMap arg) { return new EmptyMapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -157,7 +157,7 @@ public static T validate(Map arg, SchemaCo public class AdditionalProperties5 extends StringJsonSchema {} - class MapWithUndeclaredPropertiesStringMap extends FrozenMap { + public static class MapWithUndeclaredPropertiesStringMap extends FrozenMap { MapWithUndeclaredPropertiesStringMap(FrozenMap m) { super(m); } @@ -171,7 +171,7 @@ public class MapWithUndeclaredPropertiesString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties5.class; - public static MapWithUndeclaredPropertiesStringMap getMapOutputInstance(FrozenMap arg) { + static MapWithUndeclaredPropertiesStringMap getMapOutputInstance(FrozenMap arg) { return new MapWithUndeclaredPropertiesStringMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -180,7 +180,7 @@ public static T validate(Map arg, SchemaCo } - class AdditionalPropertiesClassMap extends FrozenMap { + public static class AdditionalPropertiesClassMap extends FrozenMap { AdditionalPropertiesClassMap(FrozenMap m) { super(m); } @@ -209,7 +209,7 @@ public class AdditionalPropertiesClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("empty_map", EmptyMap.class), new AbstractMap.SimpleEntry>("map_with_undeclared_properties_string", MapWithUndeclaredPropertiesString.class) )); - public static AdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { + static AdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 20a945550b2..132eb9275c9 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 @@ -19,7 +19,7 @@ public class AdditionalPropertiesValidator { public class AdditionalProperties extends AnyTypeJsonSchema {} - class Schema0Map extends FrozenMap { + public static class Schema0Map extends FrozenMap { Schema0Map(FrozenMap m) { super(m); } @@ -33,7 +33,7 @@ public class Schema0 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static Schema0Map getMapOutputInstance(FrozenMap arg) { + static Schema0Map getMapOutputInstance(FrozenMap arg) { return new Schema0Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -92,7 +92,7 @@ public static U validate(List arg, SchemaConfigur } } - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -106,7 +106,7 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -165,7 +165,7 @@ public static U validate(List arg, SchemaConfigur } } - class Schema2Map extends FrozenMap { + public static class Schema2Map extends FrozenMap { Schema2Map(FrozenMap m) { super(m); } @@ -179,7 +179,7 @@ public class Schema2 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - public static Schema2Map getMapOutputInstance(FrozenMap arg) { + static Schema2Map getMapOutputInstance(FrozenMap arg) { return new Schema2Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 95793db76be..ab1f7582171 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 @@ -22,7 +22,7 @@ public static U validate(List arg, SchemaConfigur } } - class AdditionalPropertiesWithArrayOfEnumsMap extends FrozenMap { + public static class AdditionalPropertiesWithArrayOfEnumsMap extends FrozenMap { AdditionalPropertiesWithArrayOfEnumsMap(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class AdditionalPropertiesWithArrayOfEnums1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static AdditionalPropertiesWithArrayOfEnumsMap getMapOutputInstance(FrozenMap arg) { + static AdditionalPropertiesWithArrayOfEnumsMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesWithArrayOfEnumsMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 989063e0e34..fdb3a8e26d2 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 @@ -14,7 +14,7 @@ public class Address { public class AdditionalProperties extends IntJsonSchema {} - class AddressMap extends FrozenMap { + public static class AddressMap extends FrozenMap { AddressMap(FrozenMap m) { super(m); } @@ -34,7 +34,7 @@ public class Address1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static AddressMap getMapOutputInstance(FrozenMap arg) { + static AddressMap getMapOutputInstance(FrozenMap arg) { return new AddressMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 3e5a6611775..307452eae91 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 @@ -25,7 +25,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class AnimalMap extends FrozenMap { + public static class AnimalMap extends FrozenMap { AnimalMap(FrozenMap m) { super(m); } @@ -51,7 +51,7 @@ public class Animal1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - public static AnimalMap getMapOutputInstance(FrozenMap arg) { + static AnimalMap getMapOutputInstance(FrozenMap arg) { return new AnimalMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 04045fe8138..c16faf295b4 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 @@ -476,7 +476,7 @@ public static U validate(List arg, SchemaConfigur } } - class AnyTypeAndFormatMap extends FrozenMap { + public static class AnyTypeAndFormatMap extends FrozenMap { AnyTypeAndFormatMap(FrozenMap m) { super(m); } @@ -506,7 +506,7 @@ public class AnyTypeAndFormat1 implements JsonSchema { new AbstractMap.SimpleEntry>("double", DoubleSchema.class), new AbstractMap.SimpleEntry>("float", FloatSchema.class) )); - public static AnyTypeAndFormatMap getMapOutputInstance(FrozenMap arg) { + static AnyTypeAndFormatMap getMapOutputInstance(FrozenMap arg) { return new AnyTypeAndFormatMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 151403d4232..cecf68ae082 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 @@ -23,7 +23,7 @@ public class Type extends StringJsonSchema {} public class Message extends StringJsonSchema {} - class ApiResponseMap extends FrozenMap { + public static class ApiResponseMap extends FrozenMap { ApiResponseMap(FrozenMap m) { super(m); } @@ -47,7 +47,7 @@ public class ApiResponseSchema1 implements JsonSchema { new AbstractMap.SimpleEntry>("type", Type.class), new AbstractMap.SimpleEntry>("message", Message.class) )); - public static ApiResponseMap getMapOutputInstance(FrozenMap arg) { + static ApiResponseMap getMapOutputInstance(FrozenMap arg) { return new ApiResponseMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 6bc3dcc0aa8..5889bf7fef0 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 @@ -30,7 +30,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class AppleMap extends FrozenMap { + public static class AppleMap extends FrozenMap { AppleMap(FrozenMap m) { super(m); } 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 cf7be7a9f9f..cf6812a5d38 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 @@ -26,7 +26,7 @@ public class Cultivar extends StringJsonSchema {} public class Mealy extends BooleanJsonSchema {} - class AppleReqMap extends FrozenMap { + public static class AppleReqMap extends FrozenMap { AppleReqMap(FrozenMap m) { super(m); } @@ -53,7 +53,7 @@ public class AppleReq1 implements JsonSchema { "cultivar" )); static final Class additionalProperties = AdditionalProperties.class; - public static AppleReqMap getMapOutputInstance(FrozenMap arg) { + static AppleReqMap getMapOutputInstance(FrozenMap arg) { return new AppleReqMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 51243dcd64e..69a7817c0fe 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 @@ -38,7 +38,7 @@ public static U validate(List arg, SchemaConfigur } } - class ArrayOfArrayOfNumberOnlyMap extends FrozenMap { + public static class ArrayOfArrayOfNumberOnlyMap extends FrozenMap { ArrayOfArrayOfNumberOnlyMap(FrozenMap m) { super(m); } @@ -60,7 +60,7 @@ public class ArrayOfArrayOfNumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayArrayNumber", ArrayArrayNumber.class) )); - public static ArrayOfArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { + static ArrayOfArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new ArrayOfArrayOfNumberOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 6385421d7c6..c1b03f99aff 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 @@ -28,7 +28,7 @@ public static U validate(List arg, SchemaConfigur } } - class ArrayOfNumberOnlyMap extends FrozenMap { + public static class ArrayOfNumberOnlyMap extends FrozenMap { ArrayOfNumberOnlyMap(FrozenMap m) { super(m); } @@ -50,7 +50,7 @@ public class ArrayOfNumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayNumber", ArrayNumber.class) )); - public static ArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { + static ArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new ArrayOfNumberOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 361ac153f17..2b3d67471c2 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 @@ -72,7 +72,7 @@ public static U validate(List arg, SchemaConfigur } } - class ArrayTestMap extends FrozenMap { + public static class ArrayTestMap extends FrozenMap { ArrayTestMap(FrozenMap m) { super(m); } @@ -96,7 +96,7 @@ public class ArrayTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("array_array_of_integer", ArrayArrayOfInteger.class), new AbstractMap.SimpleEntry>("array_array_of_model", ArrayArrayOfModel.class) )); - public static ArrayTestMap getMapOutputInstance(FrozenMap arg) { + static ArrayTestMap getMapOutputInstance(FrozenMap arg) { return new ArrayTestMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 1ac924aa2b0..30af4163b33 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 @@ -16,7 +16,7 @@ public class Banana { public class LengthCm extends NumberJsonSchema {} - class BananaMap extends FrozenMap { + public static class BananaMap extends FrozenMap { BananaMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class Banana1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "lengthCm" )); - public static BananaMap getMapOutputInstance(FrozenMap arg) { + static BananaMap getMapOutputInstance(FrozenMap arg) { return new BananaMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 2724f880b94..85e3f9a700e 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 @@ -26,7 +26,7 @@ public class LengthCm extends NumberJsonSchema {} public class Sweet extends BooleanJsonSchema {} - class BananaReqMap extends FrozenMap { + public static class BananaReqMap extends FrozenMap { BananaReqMap(FrozenMap m) { super(m); } @@ -53,7 +53,7 @@ public class BananaReq1 implements JsonSchema { "lengthCm" )); static final Class additionalProperties = AdditionalProperties.class; - public static BananaReqMap getMapOutputInstance(FrozenMap arg) { + static BananaReqMap getMapOutputInstance(FrozenMap arg) { return new BananaReqMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 addaddeb7f2..5909f119d7c 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 @@ -21,7 +21,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class BasquePigMap extends FrozenMap { + public static class BasquePigMap extends FrozenMap { BasquePigMap(FrozenMap m) { super(m); } @@ -46,7 +46,7 @@ public class BasquePig1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - public static BasquePigMap getMapOutputInstance(FrozenMap arg) { + static BasquePigMap getMapOutputInstance(FrozenMap arg) { return new BasquePigMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 a10a67ced1e..2399f7a48c4 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 @@ -31,7 +31,7 @@ public class SCAETHFlowPoints extends StringJsonSchema {} public class ATTNAME extends StringJsonSchema {} - class CapitalizationMap extends FrozenMap { + public static class CapitalizationMap extends FrozenMap { CapitalizationMap(FrozenMap m) { super(m); } @@ -58,7 +58,7 @@ public class Capitalization1 implements JsonSchema { new AbstractMap.SimpleEntry>("SCA_ETH_Flow_Points", SCAETHFlowPoints.class), new AbstractMap.SimpleEntry>("ATT_NAME", ATTNAME.class) )); - public static CapitalizationMap getMapOutputInstance(FrozenMap arg) { + static CapitalizationMap getMapOutputInstance(FrozenMap arg) { return new CapitalizationMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 2d54f81f686..d4546a441e9 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 @@ -21,7 +21,7 @@ public class Cat { public class Declawed extends BooleanJsonSchema {} - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -37,7 +37,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("declawed", Declawed.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 0008a868f03..82ac96feba7 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 @@ -25,7 +25,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class CategoryMap extends FrozenMap { + public static class CategoryMap extends FrozenMap { CategoryMap(FrozenMap m) { super(m); } @@ -51,7 +51,7 @@ public class Category1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "name" )); - public static CategoryMap getMapOutputInstance(FrozenMap arg) { + static CategoryMap getMapOutputInstance(FrozenMap arg) { return new CategoryMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 fb9cc97c780..4b1c789409e 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 @@ -21,7 +21,7 @@ public class ChildCat { public class Name extends StringJsonSchema {} - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -37,7 +37,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 c1f01e99a31..6385bedf9db 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 @@ -19,7 +19,7 @@ public class ClassModel { public class ClassSchema extends StringJsonSchema {} - class ClassModelMap extends FrozenMap { + public static class ClassModelMap extends FrozenMap { ClassModelMap(FrozenMap m) { super(m); } 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 80a4898f84e..38b95cef882 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 @@ -16,7 +16,7 @@ public class Client { public class Client2 extends StringJsonSchema {} - class ClientMap extends FrozenMap { + public static class ClientMap extends FrozenMap { ClientMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class Client1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("client", Client2.class) )); - public static ClientMap getMapOutputInstance(FrozenMap arg) { + static ClientMap getMapOutputInstance(FrozenMap arg) { return new ClientMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 228005014bc..8c8a5561666 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 @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 6d2fee84de9..b7309650631 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 @@ -21,7 +21,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class DanishPigMap extends FrozenMap { + public static class DanishPigMap extends FrozenMap { DanishPigMap(FrozenMap m) { super(m); } @@ -46,7 +46,7 @@ public class DanishPig1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - public static DanishPigMap getMapOutputInstance(FrozenMap arg) { + static DanishPigMap getMapOutputInstance(FrozenMap arg) { return new DanishPigMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 632a13c1cba..2b7ad2d19af 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 @@ -21,7 +21,7 @@ public class Dog { public class Breed extends StringJsonSchema {} - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -37,7 +37,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("breed", Breed.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 2bca68c5fef..e1e9ddb00c1 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 @@ -24,7 +24,7 @@ public static U validate(List arg, SchemaConfigur } } - class DrawingMap extends FrozenMap { + public static class DrawingMap extends FrozenMap { DrawingMap(FrozenMap m) { super(m); } @@ -50,7 +50,7 @@ public class Drawing1 implements JsonSchema { new AbstractMap.SimpleEntry>("shapes", Shapes.class) )); static final Class additionalProperties = Fruit.Fruit1.class; - public static DrawingMap getMapOutputInstance(FrozenMap arg) { + static DrawingMap getMapOutputInstance(FrozenMap arg) { return new DrawingMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5fdef6106c6..5c681b1e6f7 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 @@ -42,7 +42,7 @@ public static U validate(List arg, SchemaConfigur } } - class EnumArraysMap extends FrozenMap { + public static class EnumArraysMap extends FrozenMap { EnumArraysMap(FrozenMap m) { super(m); } @@ -65,7 +65,7 @@ public class EnumArrays1 implements JsonSchema { new AbstractMap.SimpleEntry>("just_symbol", JustSymbol.class), new AbstractMap.SimpleEntry>("array_enum", ArrayEnum.class) )); - public static EnumArraysMap getMapOutputInstance(FrozenMap arg) { + static EnumArraysMap getMapOutputInstance(FrozenMap arg) { return new EnumArraysMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 f8f9f512103..21e6363c3b1 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 @@ -68,7 +68,7 @@ public static Double validate(Double arg, SchemaConfiguration configuration) { } } - class EnumTestMap extends FrozenMap { + public static class EnumTestMap extends FrozenMap { EnumTestMap(FrozenMap m) { super(m); } @@ -101,7 +101,7 @@ public class EnumTest1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "enum_string_required" )); - public static EnumTestMap getMapOutputInstance(FrozenMap arg) { + static EnumTestMap getMapOutputInstance(FrozenMap arg) { return new EnumTestMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 e18352b937e..c845c888c23 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 @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 801398ce3f1..6d80e0f128f 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 @@ -16,7 +16,7 @@ public class File { public class SourceURI extends StringJsonSchema {} - class FileMap extends FrozenMap { + public static class FileMap extends FrozenMap { FileMap(FrozenMap m) { super(m); } @@ -40,7 +40,7 @@ public class File1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("sourceURI", SourceURI.class) )); - public static FileMap getMapOutputInstance(FrozenMap arg) { + static FileMap getMapOutputInstance(FrozenMap arg) { return new FileMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 0d41ed711b2..5aea0fb5b3d 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 @@ -24,7 +24,7 @@ public static U validate(List arg, SchemaConfigur } } - class FileSchemaTestClassMap extends FrozenMap { + public static class FileSchemaTestClassMap extends FrozenMap { FileSchemaTestClassMap(FrozenMap m) { super(m); } @@ -47,7 +47,7 @@ public class FileSchemaTestClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("file", File.File1.class), new AbstractMap.SimpleEntry>("files", Files.class) )); - public static FileSchemaTestClassMap getMapOutputInstance(FrozenMap arg) { + static FileSchemaTestClassMap getMapOutputInstance(FrozenMap arg) { return new FileSchemaTestClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 b3f97fb6e6e..30bd1ad0e9a 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 @@ -12,7 +12,7 @@ public class Foo { // nest classes so all schemas and input/output classes can be public - class FooMap extends FrozenMap { + public static class FooMap extends FrozenMap { FooMap(FrozenMap m) { super(m); } @@ -34,7 +34,7 @@ public class Foo1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("bar", Bar.Bar1.class) )); - public static FooMap getMapOutputInstance(FrozenMap arg) { + static FooMap getMapOutputInstance(FrozenMap arg) { return new FooMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 95faaa338da..15202a4bf78 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 @@ -208,7 +208,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class NoneProp extends NullJsonSchema {} - class FormatTestMap extends FrozenMap { + public static class FormatTestMap extends FrozenMap { FormatTestMap(FrozenMap m) { super(m); } @@ -256,7 +256,7 @@ public class FormatTest1 implements JsonSchema { "number", "password" )); - public static FormatTestMap getMapOutputInstance(FrozenMap arg) { + static FormatTestMap getMapOutputInstance(FrozenMap arg) { return new FormatTestMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 e36c9fc208a..97cece3058b 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 @@ -20,7 +20,7 @@ public class Data extends StringJsonSchema {} public class Id extends IntJsonSchema {} - class FromSchemaMap extends FrozenMap { + public static class FromSchemaMap extends FrozenMap { FromSchemaMap(FrozenMap m) { super(m); } @@ -43,7 +43,7 @@ public class FromSchema1 implements JsonSchema { new AbstractMap.SimpleEntry>("data", Data.class), new AbstractMap.SimpleEntry>("id", Id.class) )); - public static FromSchemaMap getMapOutputInstance(FrozenMap arg) { + static FromSchemaMap getMapOutputInstance(FrozenMap arg) { return new FromSchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 7b15335521d..4f3cac0316a 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 @@ -19,7 +19,7 @@ public class Fruit { public class Color extends StringJsonSchema {} - class FruitMap extends FrozenMap { + public static class FruitMap extends FrozenMap { FruitMap(FrozenMap m) { super(m); } 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 843159a40ff..40a9b1a7f8c 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 @@ -19,7 +19,7 @@ public class GmFruit { public class Color extends StringJsonSchema {} - class GmFruitMap extends FrozenMap { + public static class GmFruitMap extends FrozenMap { GmFruitMap(FrozenMap m) { super(m); } 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 f056e84057f..5b185143c16 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 @@ -16,7 +16,7 @@ public class GrandparentAnimal { public class PetType extends StringJsonSchema {} - class GrandparentAnimalMap extends FrozenMap { + public static class GrandparentAnimalMap extends FrozenMap { GrandparentAnimalMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class GrandparentAnimal1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "pet_type" )); - public static GrandparentAnimalMap getMapOutputInstance(FrozenMap arg) { + static GrandparentAnimalMap getMapOutputInstance(FrozenMap arg) { return new GrandparentAnimalMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 242d2eb6a89..cab0ea968fe 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 @@ -19,7 +19,7 @@ public class Bar extends StringJsonSchema {} public class Foo extends StringJsonSchema {} - class HasOnlyReadOnlyMap extends FrozenMap { + public static class HasOnlyReadOnlyMap extends FrozenMap { HasOnlyReadOnlyMap(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class HasOnlyReadOnly1 implements JsonSchema { new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("foo", Foo.class) )); - public static HasOnlyReadOnlyMap getMapOutputInstance(FrozenMap arg) { + static HasOnlyReadOnlyMap getMapOutputInstance(FrozenMap arg) { return new HasOnlyReadOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 a9f271c505c..93c764e653a 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 @@ -25,7 +25,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class HealthCheckResultMap extends FrozenMap { + public static class HealthCheckResultMap extends FrozenMap { HealthCheckResultMap(FrozenMap m) { super(m); } @@ -49,7 +49,7 @@ public class HealthCheckResult1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("NullableMessage", NullableMessage.class) )); - public static HealthCheckResultMap getMapOutputInstance(FrozenMap arg) { + static HealthCheckResultMap getMapOutputInstance(FrozenMap arg) { return new HealthCheckResultMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 1e1e150c32a..0f7f45a6404 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 @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 e51fb2d0dce..61ef6b1c927 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 @@ -34,7 +34,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class JSONPatchRequestAddReplaceTestMap extends FrozenMap { + public static class JSONPatchRequestAddReplaceTestMap extends FrozenMap { JSONPatchRequestAddReplaceTestMap(FrozenMap m) { super(m); } @@ -64,7 +64,7 @@ public class JSONPatchRequestAddReplaceTest1 implements JsonSchema { "value" )); static final Class additionalProperties = AdditionalProperties.class; - public static JSONPatchRequestAddReplaceTestMap getMapOutputInstance(FrozenMap arg) { + static JSONPatchRequestAddReplaceTestMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestAddReplaceTestMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 468086dbf6b..61d00cb0ec1 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 @@ -34,7 +34,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class JSONPatchRequestMoveCopyMap extends FrozenMap { + public static class JSONPatchRequestMoveCopyMap extends FrozenMap { JSONPatchRequestMoveCopyMap(FrozenMap m) { super(m); } @@ -64,7 +64,7 @@ public class JSONPatchRequestMoveCopy1 implements JsonSchema { "path" )); static final Class additionalProperties = AdditionalProperties.class; - public static JSONPatchRequestMoveCopyMap getMapOutputInstance(FrozenMap arg) { + static JSONPatchRequestMoveCopyMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestMoveCopyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 859578eccc4..985440115bd 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 @@ -31,7 +31,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class JSONPatchRequestRemoveMap extends FrozenMap { + public static class JSONPatchRequestRemoveMap extends FrozenMap { JSONPatchRequestRemoveMap(FrozenMap m) { super(m); } @@ -59,7 +59,7 @@ public class JSONPatchRequestRemove1 implements JsonSchema { "path" )); static final Class additionalProperties = AdditionalProperties.class; - public static JSONPatchRequestRemoveMap getMapOutputInstance(FrozenMap arg) { + static JSONPatchRequestRemoveMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestRemoveMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 e83c8b7647d..c29c608ccf5 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 @@ -17,7 +17,7 @@ public class MapTest { public class AdditionalProperties1 extends StringJsonSchema {} - class AdditionalPropertiesMap extends FrozenMap { + public static class AdditionalPropertiesMap extends FrozenMap { AdditionalPropertiesMap(FrozenMap m) { super(m); } @@ -31,7 +31,7 @@ public class AdditionalProperties implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; - public static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -40,7 +40,7 @@ public static T validate(Map arg, SchemaCo } - class MapMapOfStringMap extends FrozenMap { + public static class MapMapOfStringMap extends FrozenMap { MapMapOfStringMap(FrozenMap m) { super(m); } @@ -54,7 +54,7 @@ public class MapMapOfString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static MapMapOfStringMap getMapOutputInstance(FrozenMap arg) { + static MapMapOfStringMap getMapOutputInstance(FrozenMap arg) { return new MapMapOfStringMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -72,7 +72,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class MapOfEnumStringMap extends FrozenMap { + public static class MapOfEnumStringMap extends FrozenMap { MapOfEnumStringMap(FrozenMap m) { super(m); } @@ -86,7 +86,7 @@ public class MapOfEnumString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - public static MapOfEnumStringMap getMapOutputInstance(FrozenMap arg) { + static MapOfEnumStringMap getMapOutputInstance(FrozenMap arg) { return new MapOfEnumStringMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -98,7 +98,7 @@ public static T validate(Map arg, SchemaCo public class AdditionalProperties3 extends BooleanJsonSchema {} - class DirectMapMap extends FrozenMap { + public static class DirectMapMap extends FrozenMap { DirectMapMap(FrozenMap m) { super(m); } @@ -112,7 +112,7 @@ public class DirectMap implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; - public static DirectMapMap getMapOutputInstance(FrozenMap arg) { + static DirectMapMap getMapOutputInstance(FrozenMap arg) { return new DirectMapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -121,7 +121,7 @@ public static T validate(Map arg, SchemaCo } - class MapTestMap extends FrozenMap { + public static class MapTestMap extends FrozenMap { MapTestMap(FrozenMap m) { super(m); } @@ -146,7 +146,7 @@ public class MapTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("direct_map", DirectMap.class), new AbstractMap.SimpleEntry>("indirect_map", StringBooleanMap.StringBooleanMap1.class) )); - public static MapTestMap getMapOutputInstance(FrozenMap arg) { + static MapTestMap getMapOutputInstance(FrozenMap arg) { return new MapTestMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 1f72ffba4d0..b6a1f3a79b3 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 @@ -20,7 +20,7 @@ public class UuidSchema extends UuidJsonSchema {} public class DateTime extends DateTimeJsonSchema {} - class MapMap extends FrozenMap { + public static class MapMap extends FrozenMap { MapMap(FrozenMap m) { super(m); } @@ -34,7 +34,7 @@ public class MapSchema implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = Animal.Animal1.class; - public static MapMap getMapOutputInstance(FrozenMap arg) { + static MapMap getMapOutputInstance(FrozenMap arg) { return new MapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -43,7 +43,7 @@ public static T validate(Map arg, SchemaCo } - class MixedPropertiesAndAdditionalPropertiesClassMap extends FrozenMap { + public static class MixedPropertiesAndAdditionalPropertiesClassMap extends FrozenMap { MixedPropertiesAndAdditionalPropertiesClassMap(FrozenMap m) { super(m); } @@ -67,7 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass1 implements JsonSchema new AbstractMap.SimpleEntry>("dateTime", DateTime.class), new AbstractMap.SimpleEntry>("map", MapSchema.class) )); - public static MixedPropertiesAndAdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { + static MixedPropertiesAndAdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { return new MixedPropertiesAndAdditionalPropertiesClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 27905d38b92..444fa623831 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 @@ -22,7 +22,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} public class Amount extends DecimalJsonSchema {} - class MoneyMap extends FrozenMap { + public static class MoneyMap extends FrozenMap { MoneyMap(FrozenMap m) { super(m); } @@ -50,7 +50,7 @@ public class Money1 implements JsonSchema { "currency" )); static final Class additionalProperties = AdditionalProperties.class; - public static MoneyMap getMapOutputInstance(FrozenMap arg) { + static MoneyMap getMapOutputInstance(FrozenMap arg) { return new MoneyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 4c764765baa..383d9699930 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 @@ -22,7 +22,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} public class Id extends UuidJsonSchema {} - class MyObjectDtoMap extends FrozenMap { + public static class MyObjectDtoMap extends FrozenMap { MyObjectDtoMap(FrozenMap m) { super(m); } @@ -45,7 +45,7 @@ public class MyObjectDto1 implements JsonSchema { new AbstractMap.SimpleEntry>("id", Id.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static MyObjectDtoMap getMapOutputInstance(FrozenMap arg) { + static MyObjectDtoMap getMapOutputInstance(FrozenMap arg) { return new MyObjectDtoMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 4cab04447d1..46736abaa71 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 @@ -28,7 +28,7 @@ public class SnakeCase extends Int32JsonSchema {} public class Property extends StringJsonSchema {} - class NameMap extends FrozenMap { + public static class NameMap extends FrozenMap { NameMap(FrozenMap m) { super(m); } 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 147c98195e1..36bdcf3fd4e 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 @@ -25,7 +25,7 @@ public class Id extends Int64JsonSchema {} public class PetId extends Int64JsonSchema {} - class NoAdditionalPropertiesMap extends FrozenMap { + public static class NoAdditionalPropertiesMap extends FrozenMap { NoAdditionalPropertiesMap(FrozenMap m) { super(m); } @@ -52,7 +52,7 @@ public class NoAdditionalProperties1 implements JsonSchema { "id" )); static final Class additionalProperties = AdditionalProperties.class; - public static NoAdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + static NoAdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new NoAdditionalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 c116db40211..238d5d0af54 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 @@ -210,7 +210,7 @@ public static U validate(List arg, SchemaConfigur public class AdditionalProperties extends MapJsonSchema {} - class ObjectNullablePropMap extends FrozenMap { + public static class ObjectNullablePropMap extends FrozenMap { ObjectNullablePropMap(FrozenMap m) { super(m); } @@ -246,7 +246,7 @@ public static T validate(Map arg, SchemaCo } } - class ObjectAndItemsNullablePropMap extends FrozenMap { + public static class ObjectAndItemsNullablePropMap extends FrozenMap { ObjectAndItemsNullablePropMap(FrozenMap m) { super(m); } @@ -282,7 +282,7 @@ public static T validate(Map arg, SchemaCo } } - class ObjectItemsNullableMap extends FrozenMap { + public static class ObjectItemsNullableMap extends FrozenMap { ObjectItemsNullableMap(FrozenMap m) { super(m); } @@ -296,7 +296,7 @@ public class ObjectItemsNullable implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - public static ObjectItemsNullableMap getMapOutputInstance(FrozenMap arg) { + static ObjectItemsNullableMap getMapOutputInstance(FrozenMap arg) { return new ObjectItemsNullableMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -305,7 +305,7 @@ public static T validate(Map arg, SchemaCo } - class NullableClassMap extends FrozenMap { + public static class NullableClassMap extends FrozenMap { NullableClassMap(FrozenMap m) { super(m); } @@ -339,7 +339,7 @@ public class NullableClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("object_items_nullable", ObjectItemsNullable.class) )); static final Class additionalProperties = AdditionalProperties3.class; - public static NullableClassMap getMapOutputInstance(FrozenMap arg) { + static NullableClassMap getMapOutputInstance(FrozenMap arg) { return new NullableClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 836b83a5df4..40cfe970624 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 @@ -16,7 +16,7 @@ public class NumberOnly { public class JustNumber extends NumberJsonSchema {} - class NumberOnlyMap extends FrozenMap { + public static class NumberOnlyMap extends FrozenMap { NumberOnlyMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class NumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("JustNumber", JustNumber.class) )); - public static NumberOnlyMap getMapOutputInstance(FrozenMap arg) { + static NumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new NumberOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 af670099c64..33caa983f25 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 @@ -16,7 +16,7 @@ public class ObjWithRequiredProps { public class A extends StringJsonSchema {} - class ObjWithRequiredPropsMap extends FrozenMap { + public static class ObjWithRequiredPropsMap extends FrozenMap { ObjWithRequiredPropsMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class ObjWithRequiredProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "a" )); - public static ObjWithRequiredPropsMap getMapOutputInstance(FrozenMap arg) { + static ObjWithRequiredPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjWithRequiredPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 f98fe5a83a2..33cddf70b74 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 @@ -16,7 +16,7 @@ public class ObjWithRequiredPropsBase { public class B extends StringJsonSchema {} - class ObjWithRequiredPropsBaseMap extends FrozenMap { + public static class ObjWithRequiredPropsBaseMap extends FrozenMap { ObjWithRequiredPropsBaseMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class ObjWithRequiredPropsBase1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "b" )); - public static ObjWithRequiredPropsBaseMap getMapOutputInstance(FrozenMap arg) { + static ObjWithRequiredPropsBaseMap getMapOutputInstance(FrozenMap arg) { return new ObjWithRequiredPropsBaseMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 b0c9db18148..9ea6ab15d18 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 @@ -19,7 +19,7 @@ public class Arg extends StringJsonSchema {} public class Args extends StringJsonSchema {} - class ObjectModelWithArgAndArgsPropertiesMap extends FrozenMap { + public static class ObjectModelWithArgAndArgsPropertiesMap extends FrozenMap { ObjectModelWithArgAndArgsPropertiesMap(FrozenMap m) { super(m); } @@ -46,7 +46,7 @@ public class ObjectModelWithArgAndArgsProperties1 implements JsonSchema { "arg", "args" )); - public static ObjectModelWithArgAndArgsPropertiesMap getMapOutputInstance(FrozenMap arg) { + static ObjectModelWithArgAndArgsPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectModelWithArgAndArgsPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 980a2d78f0b..fe1d1a844a6 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 @@ -12,7 +12,7 @@ public class ObjectModelWithRefProps { // nest classes so all schemas and input/output classes can be public - class ObjectModelWithRefPropsMap extends FrozenMap { + public static class ObjectModelWithRefPropsMap extends FrozenMap { ObjectModelWithRefPropsMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ a model that includes properties which should stay primitive (String + Boolean) new AbstractMap.SimpleEntry>("myString", StringSchema.StringSchema1.class), new AbstractMap.SimpleEntry>("myBoolean", BooleanSchema.BooleanSchema1.class) )); - public static ObjectModelWithRefPropsMap getMapOutputInstance(FrozenMap arg) { + static ObjectModelWithRefPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectModelWithRefPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 e11af169939..db742c946d5 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 @@ -21,7 +21,7 @@ public class ObjectWithAllOfWithReqTestPropFromUnsetAddProp { public class Name extends StringJsonSchema {} - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -40,7 +40,7 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "test" )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 09ad3770990..644a0e141a1 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 @@ -19,7 +19,7 @@ public class SomeProp extends MapJsonSchema {} public class Someprop extends MapJsonSchema {} - class ObjectWithCollidingPropertiesMap extends FrozenMap { + public static class ObjectWithCollidingPropertiesMap extends FrozenMap { ObjectWithCollidingPropertiesMap(FrozenMap m) { super(m); } @@ -44,7 +44,7 @@ public class ObjectWithCollidingProperties1 implements JsonSchema { new AbstractMap.SimpleEntry>("someProp", SomeProp.class), new AbstractMap.SimpleEntry>("someprop", Someprop.class) )); - public static ObjectWithCollidingPropertiesMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithCollidingPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithCollidingPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 77466ca7766..06a1307a3f7 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 @@ -16,7 +16,7 @@ public class ObjectWithDecimalProperties { public class Width extends DecimalJsonSchema {} - class ObjectWithDecimalPropertiesMap extends FrozenMap { + public static class ObjectWithDecimalPropertiesMap extends FrozenMap { ObjectWithDecimalPropertiesMap(FrozenMap m) { super(m); } @@ -40,7 +40,7 @@ public class ObjectWithDecimalProperties1 implements JsonSchema { new AbstractMap.SimpleEntry>("width", Width.class), new AbstractMap.SimpleEntry>("cost", Money.Money1.class) )); - public static ObjectWithDecimalPropertiesMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithDecimalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithDecimalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 48d42f78871..ad3bd673b67 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 @@ -24,7 +24,7 @@ public class Schema123list extends StringJsonSchema {} public class Schema123Number extends IntJsonSchema {} - class ObjectWithDifficultlyNamedPropsMap extends FrozenMap { + public static class ObjectWithDifficultlyNamedPropsMap extends FrozenMap { ObjectWithDifficultlyNamedPropsMap(FrozenMap m) { super(m); } @@ -53,7 +53,7 @@ public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "123-list" )); - public static ObjectWithDifficultlyNamedPropsMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithDifficultlyNamedPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithDifficultlyNamedPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 ce96e99fc28..e34f8cf0ead 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 @@ -76,7 +76,7 @@ public static U validate(List arg, SchemaConfigur } } - class ObjectWithInlineCompositionPropertyMap extends FrozenMap { + public static class ObjectWithInlineCompositionPropertyMap extends FrozenMap { ObjectWithInlineCompositionPropertyMap(FrozenMap m) { super(m); } @@ -98,7 +98,7 @@ public class ObjectWithInlineCompositionProperty1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); - public static ObjectWithInlineCompositionPropertyMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithInlineCompositionPropertyMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithInlineCompositionPropertyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 13a938d0323..f198108f7b0 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 @@ -12,7 +12,7 @@ public class ObjectWithInvalidNamedRefedProperties { // nest classes so all schemas and input/output classes can be public - class ObjectWithInvalidNamedRefedPropertiesMap extends FrozenMap { + public static class ObjectWithInvalidNamedRefedPropertiesMap extends FrozenMap { ObjectWithInvalidNamedRefedPropertiesMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class ObjectWithInvalidNamedRefedProperties1 implements JsonSchema { "!reference", "from" )); - public static ObjectWithInvalidNamedRefedPropertiesMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithInvalidNamedRefedPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithInvalidNamedRefedPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 b89f2e2d42d..935ef05b9b8 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 @@ -20,7 +20,7 @@ public class AdditionalProperties extends StringJsonSchema {} public class A extends NumberJsonSchema {} - class ObjectWithNonIntersectingValuesMap extends FrozenMap { + public static class ObjectWithNonIntersectingValuesMap extends FrozenMap { ObjectWithNonIntersectingValuesMap(FrozenMap m) { super(m); } @@ -43,7 +43,7 @@ public class ObjectWithNonIntersectingValues1 implements JsonSchema { new AbstractMap.SimpleEntry>("a", A.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static ObjectWithNonIntersectingValuesMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithNonIntersectingValuesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithNonIntersectingValuesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 4eeddd15615..5502eb05085 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 @@ -26,7 +26,7 @@ public class A extends StringJsonSchema {} public class B extends NumberJsonSchema {} - class ObjectWithOnlyOptionalPropsMap extends FrozenMap { + public static class ObjectWithOnlyOptionalPropsMap extends FrozenMap { ObjectWithOnlyOptionalPropsMap(FrozenMap m) { super(m); } @@ -50,7 +50,7 @@ public class ObjectWithOnlyOptionalProps1 implements JsonSchema { new AbstractMap.SimpleEntry>("b", B.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static ObjectWithOnlyOptionalPropsMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithOnlyOptionalPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOnlyOptionalPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 eab2eb4eb37..4b0bbec004c 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 @@ -16,7 +16,7 @@ public class ObjectWithOptionalTestProp { public class Test extends StringJsonSchema {} - class ObjectWithOptionalTestPropMap extends FrozenMap { + public static class ObjectWithOptionalTestPropMap extends FrozenMap { ObjectWithOptionalTestPropMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class ObjectWithOptionalTestProp1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("test", Test.class) )); - public static ObjectWithOptionalTestPropMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithOptionalTestPropMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOptionalTestPropMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 1fc40d99393..efe5207b876 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 @@ -40,7 +40,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class Complete extends BooleanJsonSchema {} - class OrderMap extends FrozenMap { + public static class OrderMap extends FrozenMap { OrderMap(FrozenMap m) { super(m); } @@ -67,7 +67,7 @@ public class Order1 implements JsonSchema { new AbstractMap.SimpleEntry>("status", Status.class), new AbstractMap.SimpleEntry>("complete", Complete.class) )); - public static OrderMap getMapOutputInstance(FrozenMap arg) { + static OrderMap getMapOutputInstance(FrozenMap arg) { return new OrderMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 8867de9b43e..a45af9854a4 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 @@ -34,7 +34,7 @@ public static U validate(List arg, SchemaConfigur } } - class PaginatedResultMyObjectDtoMap extends FrozenMap { + public static class PaginatedResultMyObjectDtoMap extends FrozenMap { PaginatedResultMyObjectDtoMap(FrozenMap m) { super(m); } @@ -62,7 +62,7 @@ public class PaginatedResultMyObjectDto1 implements JsonSchema { "results" )); static final Class additionalProperties = AdditionalProperties.class; - public static PaginatedResultMyObjectDtoMap getMapOutputInstance(FrozenMap arg) { + static PaginatedResultMyObjectDtoMap getMapOutputInstance(FrozenMap arg) { return new PaginatedResultMyObjectDtoMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 866923d9192..a39a234fc4b 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 @@ -54,7 +54,7 @@ public static U validate(List arg, SchemaConfigur } } - class PetMap extends FrozenMap { + public static class PetMap extends FrozenMap { PetMap(FrozenMap m) { super(m); } @@ -87,7 +87,7 @@ public class Pet1 implements JsonSchema { "name", "photoUrls" )); - public static PetMap getMapOutputInstance(FrozenMap arg) { + static PetMap getMapOutputInstance(FrozenMap arg) { return new PetMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 bc893cdc173..03380025c01 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 @@ -16,7 +16,7 @@ public class Player { public class Name extends StringJsonSchema {} - class PlayerMap extends FrozenMap { + public static class PlayerMap extends FrozenMap { PlayerMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class Player1 implements JsonSchema { new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("enemyPlayer", Player1.class) )); - public static PlayerMap getMapOutputInstance(FrozenMap arg) { + static PlayerMap getMapOutputInstance(FrozenMap arg) { return new PlayerMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 6f013ebe20c..fac7bccb633 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 @@ -16,7 +16,7 @@ public class PublicKey { public class Key extends StringJsonSchema {} - class PublicKeyMap extends FrozenMap { + public static class PublicKeyMap extends FrozenMap { PublicKeyMap(FrozenMap m) { super(m); } @@ -40,7 +40,7 @@ public class PublicKey1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("key", Key.class) )); - public static PublicKeyMap getMapOutputInstance(FrozenMap arg) { + static PublicKeyMap getMapOutputInstance(FrozenMap arg) { return new PublicKeyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 f2177b3a1dd..8d8dc966fd8 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 @@ -30,7 +30,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class QuadrilateralType extends StringJsonSchema {} - class QuadrilateralInterfaceMap extends FrozenMap { + public static class QuadrilateralInterfaceMap extends FrozenMap { QuadrilateralInterfaceMap(FrozenMap m) { super(m); } 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 75e9765d9c6..dfd0041f0fb 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 @@ -19,7 +19,7 @@ public class Bar extends StringJsonSchema {} public class Baz extends StringJsonSchema {} - class ReadOnlyFirstMap extends FrozenMap { + public static class ReadOnlyFirstMap extends FrozenMap { ReadOnlyFirstMap(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class ReadOnlyFirst1 implements JsonSchema { new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("baz", Baz.class) )); - public static ReadOnlyFirstMap getMapOutputInstance(FrozenMap arg) { + static ReadOnlyFirstMap getMapOutputInstance(FrozenMap arg) { return new ReadOnlyFirstMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 b9c53fab458..3524517037c 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 @@ -14,7 +14,7 @@ public class ReqPropsFromExplicitAddProps { public class AdditionalProperties extends StringJsonSchema {} - class ReqPropsFromExplicitAddPropsMap extends FrozenMap { + public static class ReqPropsFromExplicitAddPropsMap extends FrozenMap { ReqPropsFromExplicitAddPropsMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class ReqPropsFromExplicitAddProps1 implements JsonSchema { "validName" )); static final Class additionalProperties = AdditionalProperties.class; - public static ReqPropsFromExplicitAddPropsMap getMapOutputInstance(FrozenMap arg) { + static ReqPropsFromExplicitAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromExplicitAddPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 5c75c8f4d03..37b0daf6865 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 @@ -14,7 +14,7 @@ public class ReqPropsFromTrueAddProps { public class AdditionalProperties extends AnyTypeJsonSchema {} - class ReqPropsFromTrueAddPropsMap extends FrozenMap { + public static class ReqPropsFromTrueAddPropsMap extends FrozenMap { ReqPropsFromTrueAddPropsMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class ReqPropsFromTrueAddProps1 implements JsonSchema { "validName" )); static final Class additionalProperties = AdditionalProperties.class; - public static ReqPropsFromTrueAddPropsMap getMapOutputInstance(FrozenMap arg) { + static ReqPropsFromTrueAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromTrueAddPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 5873d98731f..faaf260ba1d 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 @@ -10,7 +10,7 @@ public class ReqPropsFromUnsetAddProps { // nest classes so all schemas and input/output classes can be public - class ReqPropsFromUnsetAddPropsMap extends FrozenMap { + public static class ReqPropsFromUnsetAddPropsMap extends FrozenMap { ReqPropsFromUnsetAddPropsMap(FrozenMap m) { super(m); } @@ -33,7 +33,7 @@ public class ReqPropsFromUnsetAddProps1 implements JsonSchema { "invalid-name", "validName" )); - public static ReqPropsFromUnsetAddPropsMap getMapOutputInstance(FrozenMap arg) { + static ReqPropsFromUnsetAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromUnsetAddPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 6f901e819ae..7b2fed00eb8 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 @@ -19,7 +19,7 @@ public class ReturnSchema { public class ReturnSchema2 extends Int32JsonSchema {} - class ReturnMap extends FrozenMap { + public static class ReturnMap extends FrozenMap { ReturnMap(FrozenMap m) { super(m); } 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 0adf1c47881..1f1f2ab124d 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 @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 cc171685b36..92458058a97 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 @@ -23,7 +23,7 @@ public class Name extends Int32JsonSchema {} public class ClassSchema extends StringJsonSchema {} - class Schema200ResponseMap extends FrozenMap { + public static class Schema200ResponseMap extends FrozenMap { Schema200ResponseMap(FrozenMap m) { super(m); } 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 d638f065c36..1e54b8559e7 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 @@ -12,7 +12,7 @@ public class SelfReferencingObjectModel { // nest classes so all schemas and input/output classes can be public - class SelfReferencingObjectModelMap extends FrozenMap { + public static class SelfReferencingObjectModelMap extends FrozenMap { SelfReferencingObjectModelMap(FrozenMap m) { super(m); } @@ -35,7 +35,7 @@ public class SelfReferencingObjectModel1 implements JsonSchema { new AbstractMap.SimpleEntry>("selfRef", SelfReferencingObjectModel1.class) )); static final Class additionalProperties = SelfReferencingObjectModel1.class; - public static SelfReferencingObjectModelMap getMapOutputInstance(FrozenMap arg) { + static SelfReferencingObjectModelMap getMapOutputInstance(FrozenMap arg) { return new SelfReferencingObjectModelMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 5be1b2765cb..ebb21801f2a 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 @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class Schema1Map extends FrozenMap { + public static class Schema1Map extends FrozenMap { Schema1Map(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); - public static Schema1Map getMapOutputInstance(FrozenMap arg) { + static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 93bdaa94f2a..44e8cd6b392 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 @@ -16,7 +16,7 @@ public class SpecialModelname { public class A extends StringJsonSchema {} - class SpecialModelnameMap extends FrozenMap { + public static class SpecialModelnameMap extends FrozenMap { SpecialModelnameMap(FrozenMap m) { super(m); } @@ -40,7 +40,7 @@ model with an invalid class name for python static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); - public static SpecialModelnameMap getMapOutputInstance(FrozenMap arg) { + static SpecialModelnameMap getMapOutputInstance(FrozenMap arg) { return new SpecialModelnameMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 2b87950ec43..d843373b420 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 @@ -14,7 +14,7 @@ public class StringBooleanMap { public class AdditionalProperties extends BooleanJsonSchema {} - class StringBooleanMapMap extends FrozenMap { + public static class StringBooleanMapMap extends FrozenMap { StringBooleanMapMap(FrozenMap m) { super(m); } @@ -34,7 +34,7 @@ public class StringBooleanMap1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static StringBooleanMapMap getMapOutputInstance(FrozenMap arg) { + static StringBooleanMapMap getMapOutputInstance(FrozenMap arg) { return new StringBooleanMapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 4d9ca186efe..36803c234af 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 @@ -20,7 +20,7 @@ public class Id extends Int64JsonSchema {} public class Name extends StringJsonSchema {} - class TagMap extends FrozenMap { + public static class TagMap extends FrozenMap { TagMap(FrozenMap m) { super(m); } @@ -43,7 +43,7 @@ public class Tag1 implements JsonSchema { new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("name", Name.class) )); - public static TagMap getMapOutputInstance(FrozenMap arg) { + static TagMap getMapOutputInstance(FrozenMap arg) { return new TagMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 04351d88d6a..e623b81834a 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 @@ -30,7 +30,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class TriangleType extends StringJsonSchema {} - class TriangleInterfaceMap extends FrozenMap { + public static class TriangleInterfaceMap extends FrozenMap { TriangleInterfaceMap(FrozenMap m) { super(m); } 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 0f3b43c84d7..1cfc7974e4e 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 @@ -122,7 +122,7 @@ public static U validate(List arg, SchemaConfigur public class AnyTypePropNullable extends AnyTypeJsonSchema {} - class UserMap extends FrozenMap { + public static class UserMap extends FrozenMap { UserMap(FrozenMap m) { super(m); } @@ -156,7 +156,7 @@ public class User1 implements JsonSchema { new AbstractMap.SimpleEntry>("anyTypeExceptNullProp", AnyTypeExceptNullProp.class), new AbstractMap.SimpleEntry>("anyTypePropNullable", AnyTypePropNullable.class) )); - public static UserMap getMapOutputInstance(FrozenMap arg) { + static UserMap getMapOutputInstance(FrozenMap arg) { return new UserMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 ce20ac445d3..4cb9cd547a6 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 @@ -28,7 +28,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class WhaleMap extends FrozenMap { + public static class WhaleMap extends FrozenMap { WhaleMap(FrozenMap m) { super(m); } @@ -55,7 +55,7 @@ public class Whale1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - public static WhaleMap getMapOutputInstance(FrozenMap arg) { + static WhaleMap getMapOutputInstance(FrozenMap arg) { return new WhaleMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 68858321717..6472efd042e 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 @@ -34,7 +34,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class ZebraMap extends FrozenMap { + public static class ZebraMap extends FrozenMap { ZebraMap(FrozenMap m) { super(m); } @@ -61,7 +61,7 @@ public class Zebra1 implements JsonSchema { "className" )); static final Class additionalProperties = AdditionalProperties.class; - public static ZebraMap getMapOutputInstance(FrozenMap arg) { + static ZebraMap getMapOutputInstance(FrozenMap arg) { return new ZebraMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 29fc4b08237..81ab6320843 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeaderParametersMap extends FrozenMap { + public static class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 e7ae058afa5..d62d897e431 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 856fe801ac4..e483e418a22 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 d1eb39efdc9..e5ce4a1ba64 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("searchStr", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 89dc18e5ea6..082f132a7b4 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeaderParametersMap extends FrozenMap { + public static class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d9d20272179..9aa498a08e6 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 0cc9ca8d3d2..3bc70ef42d1 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 @@ -20,7 +20,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeaderParametersMap extends FrozenMap { + public static class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class HeaderParameters1 implements JsonSchema { "required_boolean_group" )); static final Class additionalProperties = AdditionalProperties.class; - public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 bc6a1fbc4c7..b6e6af49a73 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 @@ -22,7 +22,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -46,7 +46,7 @@ public class QueryParameters1 implements JsonSchema { "required_string_group" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 59eb856fca5..e6f4a4f4457 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 @@ -20,7 +20,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeaderParametersMap extends FrozenMap { + public static class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_header_string_array", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5a59b9b8bca..bc153752738 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 @@ -22,7 +22,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_query_string_array", Schema2.Schema21.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 9f5bfd9bf43..5ccca19bd28 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 @@ -42,7 +42,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -59,7 +59,7 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_form_string_array", EnumFormStringArray.class), new AbstractMap.SimpleEntry>("enum_form_string", EnumFormString.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d0b60442ee0..373d276d13b 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 @@ -170,7 +170,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class Callback extends StringJsonSchema {} - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -205,7 +205,7 @@ public class Schema1 implements JsonSchema { "number", "pattern_without_delimiter" )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5e9c6d1d5b7..89bce81af08 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "query" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d8a784901b0..9261477596a 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 @@ -21,7 +21,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -45,7 +45,7 @@ public class QueryParameters1 implements JsonSchema { "some_var" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 a4a35e2f4cf..75999efaa38 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "id" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 b53a2dbc471..51a5564794e 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 @@ -14,7 +14,7 @@ public class Schema { public class AdditionalProperties extends StringJsonSchema {} - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -28,7 +28,7 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 bf245d7af1f..7c5e0a34507 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 @@ -20,7 +20,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("compositionInProperty", Schema1.Schema11.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 a0447cd0821..8e6abe5e633 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 @@ -76,7 +76,7 @@ public static U validate(List arg, SchemaConfigur } } - class SchemaMap1 extends FrozenMap { + public static class SchemaMap1 extends FrozenMap { SchemaMap1(FrozenMap m) { super(m); } @@ -92,7 +92,7 @@ public class Schema11 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp1.class) )); - public static SchemaMap1 getMapOutputInstance(FrozenMap arg) { + static SchemaMap1 getMapOutputInstance(FrozenMap arg) { return new SchemaMap1(arg); } public static T validate(Map arg, SchemaConfiguration 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 8858e4e27b2..a9b3b717653 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 @@ -76,7 +76,7 @@ public static U validate(List arg, SchemaConfigur } } - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -92,7 +92,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 3d7f5193a86..969bbf555e7 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 @@ -76,7 +76,7 @@ public static U validate(List arg, SchemaConfigur } } - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -92,7 +92,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 b61a0aec6c5..eead4597350 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 @@ -19,7 +19,7 @@ public class Param extends StringJsonSchema {} public class Param2 extends StringJsonSchema {} - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -40,7 +40,7 @@ public class Schema1 implements JsonSchema { "param", "param2" )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 098835d2356..185846a61e9 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 @@ -16,7 +16,7 @@ public class Schema { public class A extends StringJsonSchema {} - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -32,7 +32,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 3f72e0918bf..c5ae02c6cb0 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 @@ -16,7 +16,7 @@ public class Schema { public class B extends StringJsonSchema {} - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -32,7 +32,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("b", B.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 41605a5286f..906ba100e17 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("mapBean", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 ec4dd497930..00d8faa08f4 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 @@ -16,7 +16,7 @@ public class Schema0 { public class Keyword0 extends StringJsonSchema {} - class SchemaMap0 extends FrozenMap { + public static class SchemaMap0 extends FrozenMap { SchemaMap0(FrozenMap m) { super(m); } @@ -32,7 +32,7 @@ public class Schema01 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("keyword", Keyword0.class) )); - public static SchemaMap0 getMapOutputInstance(FrozenMap arg) { + static SchemaMap0 getMapOutputInstance(FrozenMap arg) { return new SchemaMap0(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 8827b435407..5289e0dccb2 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 @@ -23,7 +23,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class CookieParametersMap extends FrozenMap { + public static class CookieParametersMap extends FrozenMap { CookieParametersMap(FrozenMap m) { super(m); } @@ -44,7 +44,7 @@ public class CookieParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema17.Schema171.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static CookieParametersMap getMapOutputInstance(FrozenMap arg) { + static CookieParametersMap getMapOutputInstance(FrozenMap arg) { return new CookieParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 7b79189a002..84e7e41b9a7 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 @@ -22,7 +22,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeaderParametersMap extends FrozenMap { + public static class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema7.Schema71.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 6a3c51899d0..534a2fd146d 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 @@ -23,7 +23,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -51,7 +51,7 @@ public class PathParameters1 implements JsonSchema { "self" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 c8c758c92fe..4833b600d92 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 @@ -23,7 +23,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -44,7 +44,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema3.Schema31.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 2f93fc64aa1..707ddcde12e 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 af364246225..50917a90a25 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 @@ -21,7 +21,7 @@ public class RequiredFile implements JsonSchema { } - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "requiredFile" )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 230a46238e2..f2f1e82c030 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "someParam" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 0640049669e..cdcbf65872e 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("mapBean", Foo.Foo1.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 71daf275109..64979e0b7bd 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 @@ -24,7 +24,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -54,7 +54,7 @@ public class QueryParameters1 implements JsonSchema { "url" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 66632065fc3..20b13ea344a 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 @@ -21,7 +21,7 @@ public class File implements JsonSchema { } - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -41,7 +41,7 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "file" )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 e5c745fb6f0..c4ccec6223c 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 @@ -29,7 +29,7 @@ public static U validate(List arg, SchemaConfigur } } - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -45,7 +45,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("files", Files.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 febc70621fd..13620340e5f 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 @@ -13,7 +13,7 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -29,7 +29,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("string", Foo.Foo1.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 0e70fee9b6f..ce0ee63d563 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "status" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d43eb8007b9..bca651775ef 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "tags" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5c658a48a76..0df2a557472 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeaderParametersMap extends FrozenMap { + public static class HeaderParametersMap extends FrozenMap { HeaderParametersMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("api_key", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - public static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 c4b430a5591..7d6c6247c7e 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 19f300270d3..424534a9147 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 7ebf0ce2a39..823d5e35973 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 022c8cb86e7..f487b3c6dfa 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 @@ -19,7 +19,7 @@ public class Name extends StringJsonSchema {} public class Status extends StringJsonSchema {} - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -36,7 +36,7 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("status", Status.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 e5c5e4e95b7..49a04a92bda 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 ef1337d957f..07e941ec8fd 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 @@ -21,7 +21,7 @@ public class File implements JsonSchema { } - class SchemaMap extends FrozenMap { + public static class SchemaMap extends FrozenMap { SchemaMap(FrozenMap m) { super(m); } @@ -38,7 +38,7 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("additionalMetadata", AdditionalMetadata.class), new AbstractMap.SimpleEntry>("file", File.class) )); - public static SchemaMap getMapOutputInstance(FrozenMap arg) { + static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 825e3a8a2aa..f5f2c65a881 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "order_id" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 7f515e592d9..e84139ff442 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "order_id" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 917c57d5770..d9f61c08704 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 @@ -20,7 +20,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class QueryParametersMap extends FrozenMap { + public static class QueryParametersMap extends FrozenMap { QueryParametersMap(FrozenMap m) { super(m); } @@ -42,7 +42,7 @@ public class QueryParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - public static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 1cfbc8b15a6..4d83f3c91a7 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 @@ -23,7 +23,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class HeadersMap extends FrozenMap { + public static class HeadersMap extends FrozenMap { HeadersMap(FrozenMap m) { super(m); } @@ -49,7 +49,7 @@ public class Headers1 implements JsonSchema { "ref-content-schema-header" )); static final Class additionalProperties = AdditionalProperties.class; - public static HeadersMap getMapOutputInstance(FrozenMap arg) { + static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 8ff74704c46..8be473a57b7 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 b3f0726510a..df299442e1b 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 49ff034f0c1..81c1d9584a5 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 @@ -19,7 +19,7 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} // NotAnyTypeSchema - class PathParametersMap extends FrozenMap { + public static class PathParametersMap extends FrozenMap { PathParametersMap(FrozenMap m) { super(m); } @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - public static PathParametersMap getMapOutputInstance(FrozenMap arg) { + static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java index 7955562a2d1..5c07f836f6b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java @@ -142,7 +142,7 @@ private static Object getNewInstance(Class cls, Object arg, List usedArg = getProperties(arg, pathToItem, pathToSchemas); try { - Method method = cls.getMethod("getMapOutputInstance", FrozenMap.class); + Method method = cls.getDeclaredMethod("getMapOutputInstance", FrozenMap.class); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; @@ -152,7 +152,7 @@ private static Object getNewInstance(Class cls, Object arg, List usedArg = getItems(arg, pathToItem, pathToSchemas); try { - Method method = cls.getMethod("getListOutputInstance", FrozenList.class); + Method method = cls.getDeclaredMethod("getListOutputInstance", FrozenList.class); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java index a7d1ead5f95..abc3bae649c 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java @@ -12,10 +12,10 @@ import java.util.Set; class ObjectWithPropsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) )); @@ -25,10 +25,10 @@ public static FrozenMap validate(Map arg, Schema } class ObjectWithAddpropsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final Class additionalProperties = StringJsonSchema.class; + public static final Class additionalProperties = StringJsonSchema.class; public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithAddpropsSchema.class, arg, configuration); @@ -36,13 +36,13 @@ public static FrozenMap validate(Map arg, Schema } class ObjectWithPropsAndAddpropsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) )); - static final Class additionalProperties = BooleanJsonSchema.class; + public static final Class additionalProperties = BooleanJsonSchema.class; public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithPropsAndAddpropsSchema.class, arg, configuration); @@ -61,14 +61,14 @@ public static ObjectWithOutputTypeSchemaMap of(Map arg, SchemaCo class ObjectWithOutputTypeSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) )); - public static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOutputTypeSchemaMap(arg); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs index c1b93453bad..e5412bf3d14 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs @@ -69,7 +69,7 @@ public class {{jsonPathPiece.camelCase}} implements JsonSchema { {{!> components/schemas/schema_cls/_unevaluated_properties }} {{/if}} {{#if mapOutputJsonPathPiece}} - public static {{mapOutputJsonPathPiece.camelCase}} getMapOutputInstance(FrozenMap arg) { + static {{mapOutputJsonPathPiece.camelCase}} getMapOutputInstance(FrozenMap arg) { return new {{mapOutputJsonPathPiece.camelCase}}(arg); } {{/if}} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs index 0aba48b3de8..d56b3981ade 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_objectOutputType.hbs @@ -2,18 +2,18 @@ {{#if mapValueSchema}} {{#if mapValueSchema.refInfo.refClass}} -class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap components/schemas/types/schema_output_type mode="unprefixed" fullRefModule="" endChar="]):" }}{{/with}}Object> { +public static class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap components/schemas/types/schema_output_type mode="unprefixed" fullRefModule="" endChar="]):" }}{{/with}}Object> { {{mapOutputJsonPathPiece.camelCase}}(FrozenMap m) { super(m); } {{else}} -class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap components/schemas/types/schema_output_type mode="unprefixed" fullRefModule=null endChar="]):" }}{{/with}}Object> { +public static class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap components/schemas/types/schema_output_type mode="unprefixed" fullRefModule=null endChar="]):" }}{{/with}}Object> { {{mapOutputJsonPathPiece.camelCase}}(FrozenMap m) { super(m); } {{/if}} {{else}} -class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap { +public static class {{mapOutputJsonPathPiece.camelCase}} extends FrozenMap { {{mapOutputJsonPathPiece.camelCase}}(FrozenMap m) { super(m); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs index 491256dd12e..559e19bb563 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs @@ -142,7 +142,7 @@ public interface JsonSchema extends SchemaValidator { if (arg instanceof Map) { FrozenMap usedArg = getProperties(arg, pathToItem, pathToSchemas); try { - Method method = cls.getMethod("getMapOutputInstance", FrozenMap.class); + Method method = cls.getDeclaredMethod("getMapOutputInstance", FrozenMap.class); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; @@ -152,7 +152,7 @@ public interface JsonSchema extends SchemaValidator { } else if (arg instanceof List) { FrozenList usedArg = getItems(arg, pathToItem, pathToSchemas); try { - Method method = cls.getMethod("getListOutputInstance", FrozenList.class); + Method method = cls.getDeclaredMethod("getListOutputInstance", FrozenList.class); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs index 6c329eb4840..da40cb4a79b 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs @@ -12,10 +12,10 @@ import java.util.Map; import java.util.Set; class ObjectWithPropsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) )); @@ -25,10 +25,10 @@ class ObjectWithPropsSchema implements JsonSchema { } class ObjectWithAddpropsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final Class additionalProperties = StringJsonSchema.class; + public static final Class additionalProperties = StringJsonSchema.class; public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithAddpropsSchema.class, arg, configuration); @@ -36,13 +36,13 @@ class ObjectWithAddpropsSchema implements JsonSchema { } class ObjectWithPropsAndAddpropsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) )); - static final Class additionalProperties = BooleanJsonSchema.class; + public static final Class additionalProperties = BooleanJsonSchema.class; public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithPropsAndAddpropsSchema.class, arg, configuration); @@ -61,14 +61,14 @@ class ObjectWithOutputTypeSchemaMap extends FrozenMap { class ObjectWithOutputTypeSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) )); - public static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { + static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOutputTypeSchemaMap(arg); } From 513599679062eeb68dc19a3a1459c667af8582a3 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 19 Nov 2023 09:30:07 -0800 Subject: [PATCH 05/15] Makes getMapOutputInstance protected --- .../responses/headerswithnobody/Headers.java | 2 +- .../successinlinecontentandheader/Headers.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../successwithjsonapiresponse/Headers.java | 2 +- .../components/schemas/AbstractStepMessage.java | 2 +- .../schemas/AdditionalPropertiesClass.java | 14 +++++++------- .../schemas/AdditionalPropertiesValidator.java | 6 +++--- .../AdditionalPropertiesWithArrayOfEnums.java | 2 +- .../components/schemas/Address.java | 2 +- .../components/schemas/Animal.java | 2 +- .../components/schemas/AnyTypeAndFormat.java | 2 +- .../components/schemas/ApiResponseSchema.java | 2 +- .../components/schemas/AppleReq.java | 2 +- .../schemas/ArrayOfArrayOfNumberOnly.java | 2 +- .../components/schemas/ArrayOfNumberOnly.java | 2 +- .../components/schemas/ArrayTest.java | 2 +- .../components/schemas/Banana.java | 2 +- .../components/schemas/BananaReq.java | 2 +- .../components/schemas/BasquePig.java | 2 +- .../components/schemas/Capitalization.java | 2 +- .../components/schemas/Cat.java | 2 +- .../components/schemas/Category.java | 2 +- .../components/schemas/ChildCat.java | 2 +- .../components/schemas/Client.java | 2 +- .../components/schemas/ComplexQuadrilateral.java | 2 +- .../components/schemas/DanishPig.java | 2 +- .../components/schemas/Dog.java | 2 +- .../components/schemas/Drawing.java | 2 +- .../components/schemas/EnumArrays.java | 2 +- .../components/schemas/EnumTest.java | 2 +- .../components/schemas/EquilateralTriangle.java | 2 +- .../components/schemas/File.java | 2 +- .../components/schemas/FileSchemaTestClass.java | 2 +- .../components/schemas/Foo.java | 2 +- .../components/schemas/FormatTest.java | 2 +- .../components/schemas/FromSchema.java | 2 +- .../components/schemas/GrandparentAnimal.java | 2 +- .../components/schemas/HasOnlyReadOnly.java | 2 +- .../components/schemas/HealthCheckResult.java | 2 +- .../components/schemas/IsoscelesTriangle.java | 2 +- .../schemas/JSONPatchRequestAddReplaceTest.java | 2 +- .../schemas/JSONPatchRequestMoveCopy.java | 2 +- .../components/schemas/JSONPatchRequestRemove.java | 2 +- .../components/schemas/MapTest.java | 10 +++++----- ...ixedPropertiesAndAdditionalPropertiesClass.java | 4 ++-- .../components/schemas/Money.java | 2 +- .../components/schemas/MyObjectDto.java | 2 +- .../components/schemas/NoAdditionalProperties.java | 2 +- .../components/schemas/NullableClass.java | 4 ++-- .../components/schemas/NumberOnly.java | 2 +- .../components/schemas/ObjWithRequiredProps.java | 2 +- .../schemas/ObjWithRequiredPropsBase.java | 2 +- .../ObjectModelWithArgAndArgsProperties.java | 2 +- .../schemas/ObjectModelWithRefProps.java | 2 +- ...ctWithAllOfWithReqTestPropFromUnsetAddProp.java | 2 +- .../schemas/ObjectWithCollidingProperties.java | 2 +- .../schemas/ObjectWithDecimalProperties.java | 2 +- .../schemas/ObjectWithDifficultlyNamedProps.java | 2 +- .../ObjectWithInlineCompositionProperty.java | 2 +- .../ObjectWithInvalidNamedRefedProperties.java | 2 +- .../schemas/ObjectWithNonIntersectingValues.java | 2 +- .../schemas/ObjectWithOnlyOptionalProps.java | 2 +- .../schemas/ObjectWithOptionalTestProp.java | 2 +- .../components/schemas/Order.java | 2 +- .../schemas/PaginatedResultMyObjectDto.java | 2 +- .../components/schemas/Pet.java | 2 +- .../components/schemas/Player.java | 2 +- .../components/schemas/PublicKey.java | 2 +- .../components/schemas/ReadOnlyFirst.java | 2 +- .../schemas/ReqPropsFromExplicitAddProps.java | 2 +- .../schemas/ReqPropsFromTrueAddProps.java | 2 +- .../schemas/ReqPropsFromUnsetAddProps.java | 2 +- .../components/schemas/ScaleneTriangle.java | 2 +- .../schemas/SelfReferencingObjectModel.java | 2 +- .../components/schemas/SimpleQuadrilateral.java | 2 +- .../components/schemas/SpecialModelname.java | 2 +- .../components/schemas/StringBooleanMap.java | 2 +- .../components/schemas/Tag.java | 2 +- .../components/schemas/User.java | 2 +- .../components/schemas/Whale.java | 2 +- .../components/schemas/Zebra.java | 2 +- .../commonparamsubdir/delete/HeaderParameters.java | 2 +- .../commonparamsubdir/delete/PathParameters.java | 2 +- .../commonparamsubdir/get/PathParameters.java | 2 +- .../commonparamsubdir/get/QueryParameters.java | 2 +- .../commonparamsubdir/post/HeaderParameters.java | 2 +- .../commonparamsubdir/post/PathParameters.java | 2 +- .../paths/fake/delete/HeaderParameters.java | 2 +- .../paths/fake/delete/QueryParameters.java | 2 +- .../paths/fake/get/HeaderParameters.java | 2 +- .../paths/fake/get/QueryParameters.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../put/QueryParameters.java | 2 +- .../put/QueryParameters.java | 2 +- .../fakedeletecoffeeid/delete/PathParameters.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../post/QueryParameters.java | 2 +- .../post/parameters/parameter1/Schema1.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../paths/fakeobjinquery/get/QueryParameters.java | 2 +- .../get/parameters/parameter0/Schema0.java | 2 +- .../post/CookieParameters.java | 2 +- .../post/HeaderParameters.java | 2 +- .../post/PathParameters.java | 2 +- .../post/QueryParameters.java | 2 +- .../post/PathParameters.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../get/QueryParameters.java | 2 +- .../fakerefobjinquery/get/QueryParameters.java | 2 +- .../put/QueryParameters.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../paths/petfindbystatus/get/QueryParameters.java | 2 +- .../paths/petfindbytags/get/QueryParameters.java | 2 +- .../paths/petpetid/delete/HeaderParameters.java | 2 +- .../paths/petpetid/delete/PathParameters.java | 2 +- .../paths/petpetid/get/PathParameters.java | 2 +- .../paths/petpetid/post/PathParameters.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../petpetiduploadimage/post/PathParameters.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../storeorderorderid/delete/PathParameters.java | 2 +- .../storeorderorderid/get/PathParameters.java | 2 +- .../paths/userlogin/get/QueryParameters.java | 2 +- .../get/responses/response200/Headers.java | 2 +- .../paths/userusername/delete/PathParameters.java | 2 +- .../paths/userusername/get/PathParameters.java | 2 +- .../paths/userusername/put/PathParameters.java | 2 +- .../components/schemas/SchemaClass/_Schema_map.hbs | 2 +- .../components/schemas/Schema_getSchemas.hbs | 2 +- .../components/schemas/_arrayOutputType.hbs | 7 +++++++ 137 files changed, 157 insertions(+), 150 deletions(-) create mode 100644 src/main/resources/java/src/main/java/org/openapitools/components/schemas/_arrayOutputType.hbs 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 a69700dc2d3..964ee9fce6b 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 @@ -36,7 +36,7 @@ public class Headers1 implements JsonSchema { new AbstractMap.SimpleEntry>("location", LocationSchema.LocationSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; - static HeadersMap getMapOutputInstance(FrozenMap arg) { + protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 3bff46a7d28..051b8b011fd 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 @@ -36,7 +36,7 @@ public class Headers1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", SomeHeaderSchema.SomeHeaderSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; - static HeadersMap getMapOutputInstance(FrozenMap arg) { + protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 32c71ed39fd..1bb4a9d0556 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 @@ -28,7 +28,7 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 95f977e16da..160fbf64334 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 @@ -49,7 +49,7 @@ public class Headers1 implements JsonSchema { "stringHeader" )); static final Class additionalProperties = AdditionalProperties.class; - static HeadersMap getMapOutputInstance(FrozenMap arg) { + protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 71090d970a4..e542ce92674 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 @@ -45,7 +45,7 @@ public class AbstractStepMessage1 implements JsonSchema { "discriminator", "sequenceNumber" )); - static AbstractStepMessageMap getMapOutputInstance(FrozenMap arg) { + protected static AbstractStepMessageMap getMapOutputInstance(FrozenMap arg) { return new AbstractStepMessageMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 2dc4cb7d626..ed4a54f7008 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 @@ -33,7 +33,7 @@ public class MapProperty implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static MapPropertyMap getMapOutputInstance(FrozenMap arg) { + protected static MapPropertyMap getMapOutputInstance(FrozenMap arg) { return new MapPropertyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -59,7 +59,7 @@ public class AdditionalProperties1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + protected static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -82,7 +82,7 @@ public class MapOfMapProperty implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; - static MapOfMapPropertyMap getMapOutputInstance(FrozenMap arg) { + protected static MapOfMapPropertyMap getMapOutputInstance(FrozenMap arg) { return new MapOfMapPropertyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -117,7 +117,7 @@ public class MapWithUndeclaredPropertiesAnytype3 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; - static MapWithUndeclaredPropertiesAnytype3Map getMapOutputInstance(FrozenMap arg) { + protected static MapWithUndeclaredPropertiesAnytype3Map getMapOutputInstance(FrozenMap arg) { return new MapWithUndeclaredPropertiesAnytype3Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -145,7 +145,7 @@ public class EmptyMap implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties4.class; - static EmptyMapMap getMapOutputInstance(FrozenMap arg) { + protected static EmptyMapMap getMapOutputInstance(FrozenMap arg) { return new EmptyMapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -171,7 +171,7 @@ public class MapWithUndeclaredPropertiesString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties5.class; - static MapWithUndeclaredPropertiesStringMap getMapOutputInstance(FrozenMap arg) { + protected static MapWithUndeclaredPropertiesStringMap getMapOutputInstance(FrozenMap arg) { return new MapWithUndeclaredPropertiesStringMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -209,7 +209,7 @@ public class AdditionalPropertiesClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("empty_map", EmptyMap.class), new AbstractMap.SimpleEntry>("map_with_undeclared_properties_string", MapWithUndeclaredPropertiesString.class) )); - static AdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { + protected static AdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 132eb9275c9..28623016919 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 @@ -33,7 +33,7 @@ public class Schema0 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static Schema0Map getMapOutputInstance(FrozenMap arg) { + protected static Schema0Map getMapOutputInstance(FrozenMap arg) { return new Schema0Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -106,7 +106,7 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -179,7 +179,7 @@ public class Schema2 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - static Schema2Map getMapOutputInstance(FrozenMap arg) { + protected static Schema2Map getMapOutputInstance(FrozenMap arg) { return new Schema2Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 ab1f7582171..5ee42e6585a 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 @@ -42,7 +42,7 @@ public class AdditionalPropertiesWithArrayOfEnums1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static AdditionalPropertiesWithArrayOfEnumsMap getMapOutputInstance(FrozenMap arg) { + protected static AdditionalPropertiesWithArrayOfEnumsMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesWithArrayOfEnumsMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 fdb3a8e26d2..312c6f6eea2 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 @@ -34,7 +34,7 @@ public class Address1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static AddressMap getMapOutputInstance(FrozenMap arg) { + protected static AddressMap getMapOutputInstance(FrozenMap arg) { return new AddressMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 307452eae91..7316c0c1708 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 @@ -51,7 +51,7 @@ public class Animal1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - static AnimalMap getMapOutputInstance(FrozenMap arg) { + protected static AnimalMap getMapOutputInstance(FrozenMap arg) { return new AnimalMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 c16faf295b4..e62e5f91f85 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 @@ -506,7 +506,7 @@ public class AnyTypeAndFormat1 implements JsonSchema { new AbstractMap.SimpleEntry>("double", DoubleSchema.class), new AbstractMap.SimpleEntry>("float", FloatSchema.class) )); - static AnyTypeAndFormatMap getMapOutputInstance(FrozenMap arg) { + protected static AnyTypeAndFormatMap getMapOutputInstance(FrozenMap arg) { return new AnyTypeAndFormatMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 cecf68ae082..569fcfb9bf1 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 @@ -47,7 +47,7 @@ public class ApiResponseSchema1 implements JsonSchema { new AbstractMap.SimpleEntry>("type", Type.class), new AbstractMap.SimpleEntry>("message", Message.class) )); - static ApiResponseMap getMapOutputInstance(FrozenMap arg) { + protected static ApiResponseMap getMapOutputInstance(FrozenMap arg) { return new ApiResponseMap(arg); } 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 cf6812a5d38..fb102024fea 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 @@ -53,7 +53,7 @@ public class AppleReq1 implements JsonSchema { "cultivar" )); static final Class additionalProperties = AdditionalProperties.class; - static AppleReqMap getMapOutputInstance(FrozenMap arg) { + protected static AppleReqMap getMapOutputInstance(FrozenMap arg) { return new AppleReqMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 69a7817c0fe..6382d6d0d17 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 @@ -60,7 +60,7 @@ public class ArrayOfArrayOfNumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayArrayNumber", ArrayArrayNumber.class) )); - static ArrayOfArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { + protected static ArrayOfArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new ArrayOfArrayOfNumberOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 c1b03f99aff..707d85f8e91 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 @@ -50,7 +50,7 @@ public class ArrayOfNumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayNumber", ArrayNumber.class) )); - static ArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { + protected static ArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new ArrayOfNumberOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 2b3d67471c2..e254bab9f6d 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 @@ -96,7 +96,7 @@ public class ArrayTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("array_array_of_integer", ArrayArrayOfInteger.class), new AbstractMap.SimpleEntry>("array_array_of_model", ArrayArrayOfModel.class) )); - static ArrayTestMap getMapOutputInstance(FrozenMap arg) { + protected static ArrayTestMap getMapOutputInstance(FrozenMap arg) { return new ArrayTestMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 30af4163b33..51ab1c6cedd 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 @@ -41,7 +41,7 @@ public class Banana1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "lengthCm" )); - static BananaMap getMapOutputInstance(FrozenMap arg) { + protected static BananaMap getMapOutputInstance(FrozenMap arg) { return new BananaMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 85e3f9a700e..b3e086d0435 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 @@ -53,7 +53,7 @@ public class BananaReq1 implements JsonSchema { "lengthCm" )); static final Class additionalProperties = AdditionalProperties.class; - static BananaReqMap getMapOutputInstance(FrozenMap arg) { + protected static BananaReqMap getMapOutputInstance(FrozenMap arg) { return new BananaReqMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5909f119d7c..02ef4d4f776 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 @@ -46,7 +46,7 @@ public class BasquePig1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - static BasquePigMap getMapOutputInstance(FrozenMap arg) { + protected static BasquePigMap getMapOutputInstance(FrozenMap arg) { return new BasquePigMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 2399f7a48c4..b3768d28995 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 @@ -58,7 +58,7 @@ public class Capitalization1 implements JsonSchema { new AbstractMap.SimpleEntry>("SCA_ETH_Flow_Points", SCAETHFlowPoints.class), new AbstractMap.SimpleEntry>("ATT_NAME", ATTNAME.class) )); - static CapitalizationMap getMapOutputInstance(FrozenMap arg) { + protected static CapitalizationMap getMapOutputInstance(FrozenMap arg) { return new CapitalizationMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d4546a441e9..48d11b237a4 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 @@ -37,7 +37,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("declawed", Declawed.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 82ac96feba7..531f0c2ab16 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 @@ -51,7 +51,7 @@ public class Category1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "name" )); - static CategoryMap getMapOutputInstance(FrozenMap arg) { + protected static CategoryMap getMapOutputInstance(FrozenMap arg) { return new CategoryMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 4b1c789409e..c128c248f9e 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 @@ -37,7 +37,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 38b95cef882..242a8a3f3ca 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 @@ -38,7 +38,7 @@ public class Client1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("client", Client2.class) )); - static ClientMap getMapOutputInstance(FrozenMap arg) { + protected static ClientMap getMapOutputInstance(FrozenMap arg) { return new ClientMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 8c8a5561666..e3b683473e8 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 @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 b7309650631..3ec6cd6f68b 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 @@ -46,7 +46,7 @@ public class DanishPig1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - static DanishPigMap getMapOutputInstance(FrozenMap arg) { + protected static DanishPigMap getMapOutputInstance(FrozenMap arg) { return new DanishPigMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 2b7ad2d19af..eaec8077e97 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 @@ -37,7 +37,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("breed", Breed.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 e1e9ddb00c1..97923dbae75 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 @@ -50,7 +50,7 @@ public class Drawing1 implements JsonSchema { new AbstractMap.SimpleEntry>("shapes", Shapes.class) )); static final Class additionalProperties = Fruit.Fruit1.class; - static DrawingMap getMapOutputInstance(FrozenMap arg) { + protected static DrawingMap getMapOutputInstance(FrozenMap arg) { return new DrawingMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5c681b1e6f7..591e5d6ab37 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 @@ -65,7 +65,7 @@ public class EnumArrays1 implements JsonSchema { new AbstractMap.SimpleEntry>("just_symbol", JustSymbol.class), new AbstractMap.SimpleEntry>("array_enum", ArrayEnum.class) )); - static EnumArraysMap getMapOutputInstance(FrozenMap arg) { + protected static EnumArraysMap getMapOutputInstance(FrozenMap arg) { return new EnumArraysMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 21e6363c3b1..a3d13f1358c 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 @@ -101,7 +101,7 @@ public class EnumTest1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "enum_string_required" )); - static EnumTestMap getMapOutputInstance(FrozenMap arg) { + protected static EnumTestMap getMapOutputInstance(FrozenMap arg) { return new EnumTestMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 c845c888c23..7ebfe3de459 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 @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 6d80e0f128f..fdaba31023e 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 @@ -40,7 +40,7 @@ public class File1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("sourceURI", SourceURI.class) )); - static FileMap getMapOutputInstance(FrozenMap arg) { + protected static FileMap getMapOutputInstance(FrozenMap arg) { return new FileMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5aea0fb5b3d..d0fca00bb3e 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 @@ -47,7 +47,7 @@ public class FileSchemaTestClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("file", File.File1.class), new AbstractMap.SimpleEntry>("files", Files.class) )); - static FileSchemaTestClassMap getMapOutputInstance(FrozenMap arg) { + protected static FileSchemaTestClassMap getMapOutputInstance(FrozenMap arg) { return new FileSchemaTestClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 30bd1ad0e9a..c8578f31a11 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 @@ -34,7 +34,7 @@ public class Foo1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("bar", Bar.Bar1.class) )); - static FooMap getMapOutputInstance(FrozenMap arg) { + protected static FooMap getMapOutputInstance(FrozenMap arg) { return new FooMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 15202a4bf78..132a5928daf 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 @@ -256,7 +256,7 @@ public class FormatTest1 implements JsonSchema { "number", "password" )); - static FormatTestMap getMapOutputInstance(FrozenMap arg) { + protected static FormatTestMap getMapOutputInstance(FrozenMap arg) { return new FormatTestMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 97cece3058b..6a89533d4db 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 @@ -43,7 +43,7 @@ public class FromSchema1 implements JsonSchema { new AbstractMap.SimpleEntry>("data", Data.class), new AbstractMap.SimpleEntry>("id", Id.class) )); - static FromSchemaMap getMapOutputInstance(FrozenMap arg) { + protected static FromSchemaMap getMapOutputInstance(FrozenMap arg) { return new FromSchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 5b185143c16..f96cc28374a 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 @@ -41,7 +41,7 @@ public class GrandparentAnimal1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "pet_type" )); - static GrandparentAnimalMap getMapOutputInstance(FrozenMap arg) { + protected static GrandparentAnimalMap getMapOutputInstance(FrozenMap arg) { return new GrandparentAnimalMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 cab0ea968fe..f74c513725c 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 @@ -42,7 +42,7 @@ public class HasOnlyReadOnly1 implements JsonSchema { new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("foo", Foo.class) )); - static HasOnlyReadOnlyMap getMapOutputInstance(FrozenMap arg) { + protected static HasOnlyReadOnlyMap getMapOutputInstance(FrozenMap arg) { return new HasOnlyReadOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 93c764e653a..5cd21a4d3b3 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 @@ -49,7 +49,7 @@ public class HealthCheckResult1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("NullableMessage", NullableMessage.class) )); - static HealthCheckResultMap getMapOutputInstance(FrozenMap arg) { + protected static HealthCheckResultMap getMapOutputInstance(FrozenMap arg) { return new HealthCheckResultMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 0f7f45a6404..414db68ecc4 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 @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 61ef6b1c927..be3be757814 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 @@ -64,7 +64,7 @@ public class JSONPatchRequestAddReplaceTest1 implements JsonSchema { "value" )); static final Class additionalProperties = AdditionalProperties.class; - static JSONPatchRequestAddReplaceTestMap getMapOutputInstance(FrozenMap arg) { + protected static JSONPatchRequestAddReplaceTestMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestAddReplaceTestMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 61d00cb0ec1..fa1fef3b49e 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 @@ -64,7 +64,7 @@ public class JSONPatchRequestMoveCopy1 implements JsonSchema { "path" )); static final Class additionalProperties = AdditionalProperties.class; - static JSONPatchRequestMoveCopyMap getMapOutputInstance(FrozenMap arg) { + protected static JSONPatchRequestMoveCopyMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestMoveCopyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 985440115bd..ec5e14fee23 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 @@ -59,7 +59,7 @@ public class JSONPatchRequestRemove1 implements JsonSchema { "path" )); static final Class additionalProperties = AdditionalProperties.class; - static JSONPatchRequestRemoveMap getMapOutputInstance(FrozenMap arg) { + protected static JSONPatchRequestRemoveMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestRemoveMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 c29c608ccf5..73822a188e9 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 @@ -31,7 +31,7 @@ public class AdditionalProperties implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; - static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + protected static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -54,7 +54,7 @@ public class MapMapOfString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static MapMapOfStringMap getMapOutputInstance(FrozenMap arg) { + protected static MapMapOfStringMap getMapOutputInstance(FrozenMap arg) { return new MapMapOfStringMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -86,7 +86,7 @@ public class MapOfEnumString implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - static MapOfEnumStringMap getMapOutputInstance(FrozenMap arg) { + protected static MapOfEnumStringMap getMapOutputInstance(FrozenMap arg) { return new MapOfEnumStringMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -112,7 +112,7 @@ public class DirectMap implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; - static DirectMapMap getMapOutputInstance(FrozenMap arg) { + protected static DirectMapMap getMapOutputInstance(FrozenMap arg) { return new DirectMapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -146,7 +146,7 @@ public class MapTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("direct_map", DirectMap.class), new AbstractMap.SimpleEntry>("indirect_map", StringBooleanMap.StringBooleanMap1.class) )); - static MapTestMap getMapOutputInstance(FrozenMap arg) { + protected static MapTestMap getMapOutputInstance(FrozenMap arg) { return new MapTestMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 b6a1f3a79b3..6e1ced4b153 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 @@ -34,7 +34,7 @@ public class MapSchema implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = Animal.Animal1.class; - static MapMap getMapOutputInstance(FrozenMap arg) { + protected static MapMap getMapOutputInstance(FrozenMap arg) { return new MapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -67,7 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass1 implements JsonSchema new AbstractMap.SimpleEntry>("dateTime", DateTime.class), new AbstractMap.SimpleEntry>("map", MapSchema.class) )); - static MixedPropertiesAndAdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { + protected static MixedPropertiesAndAdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { return new MixedPropertiesAndAdditionalPropertiesClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 444fa623831..d0aa92bc1dd 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 @@ -50,7 +50,7 @@ public class Money1 implements JsonSchema { "currency" )); static final Class additionalProperties = AdditionalProperties.class; - static MoneyMap getMapOutputInstance(FrozenMap arg) { + protected static MoneyMap getMapOutputInstance(FrozenMap arg) { return new MoneyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 383d9699930..cd4d135b639 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 @@ -45,7 +45,7 @@ public class MyObjectDto1 implements JsonSchema { new AbstractMap.SimpleEntry>("id", Id.class) )); static final Class additionalProperties = AdditionalProperties.class; - static MyObjectDtoMap getMapOutputInstance(FrozenMap arg) { + protected static MyObjectDtoMap getMapOutputInstance(FrozenMap arg) { return new MyObjectDtoMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 36bdcf3fd4e..78449380700 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 @@ -52,7 +52,7 @@ public class NoAdditionalProperties1 implements JsonSchema { "id" )); static final Class additionalProperties = AdditionalProperties.class; - static NoAdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { + protected static NoAdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new NoAdditionalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 238d5d0af54..293aaf7658d 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 @@ -296,7 +296,7 @@ public class ObjectItemsNullable implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; - static ObjectItemsNullableMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectItemsNullableMap getMapOutputInstance(FrozenMap arg) { return new ObjectItemsNullableMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { @@ -339,7 +339,7 @@ public class NullableClass1 implements JsonSchema { new AbstractMap.SimpleEntry>("object_items_nullable", ObjectItemsNullable.class) )); static final Class additionalProperties = AdditionalProperties3.class; - static NullableClassMap getMapOutputInstance(FrozenMap arg) { + protected static NullableClassMap getMapOutputInstance(FrozenMap arg) { return new NullableClassMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 40cfe970624..b46df94de2c 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 @@ -38,7 +38,7 @@ public class NumberOnly1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("JustNumber", JustNumber.class) )); - static NumberOnlyMap getMapOutputInstance(FrozenMap arg) { + protected static NumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new NumberOnlyMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 33caa983f25..29690485cae 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 @@ -41,7 +41,7 @@ public class ObjWithRequiredProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "a" )); - static ObjWithRequiredPropsMap getMapOutputInstance(FrozenMap arg) { + protected static ObjWithRequiredPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjWithRequiredPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 33cddf70b74..d377a6d7acf 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 @@ -41,7 +41,7 @@ public class ObjWithRequiredPropsBase1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "b" )); - static ObjWithRequiredPropsBaseMap getMapOutputInstance(FrozenMap arg) { + protected static ObjWithRequiredPropsBaseMap getMapOutputInstance(FrozenMap arg) { return new ObjWithRequiredPropsBaseMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 9ea6ab15d18..52915c33213 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 @@ -46,7 +46,7 @@ public class ObjectModelWithArgAndArgsProperties1 implements JsonSchema { "arg", "args" )); - static ObjectModelWithArgAndArgsPropertiesMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectModelWithArgAndArgsPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectModelWithArgAndArgsPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 fe1d1a844a6..d545b0b926d 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 @@ -38,7 +38,7 @@ a model that includes properties which should stay primitive (String + Boolean) new AbstractMap.SimpleEntry>("myString", StringSchema.StringSchema1.class), new AbstractMap.SimpleEntry>("myBoolean", BooleanSchema.BooleanSchema1.class) )); - static ObjectModelWithRefPropsMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectModelWithRefPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectModelWithRefPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 db742c946d5..a2044d0eb58 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 @@ -40,7 +40,7 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "test" )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 644a0e141a1..011d287056e 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 @@ -44,7 +44,7 @@ public class ObjectWithCollidingProperties1 implements JsonSchema { new AbstractMap.SimpleEntry>("someProp", SomeProp.class), new AbstractMap.SimpleEntry>("someprop", Someprop.class) )); - static ObjectWithCollidingPropertiesMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithCollidingPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithCollidingPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 06a1307a3f7..074a8eb66a2 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 @@ -40,7 +40,7 @@ public class ObjectWithDecimalProperties1 implements JsonSchema { new AbstractMap.SimpleEntry>("width", Width.class), new AbstractMap.SimpleEntry>("cost", Money.Money1.class) )); - static ObjectWithDecimalPropertiesMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithDecimalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithDecimalPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 ad3bd673b67..11688dbf86f 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 @@ -53,7 +53,7 @@ public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "123-list" )); - static ObjectWithDifficultlyNamedPropsMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithDifficultlyNamedPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithDifficultlyNamedPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 e34f8cf0ead..c8279a595ee 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 @@ -98,7 +98,7 @@ public class ObjectWithInlineCompositionProperty1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); - static ObjectWithInlineCompositionPropertyMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithInlineCompositionPropertyMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithInlineCompositionPropertyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 f198108f7b0..7e8b68761ba 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 @@ -39,7 +39,7 @@ public class ObjectWithInvalidNamedRefedProperties1 implements JsonSchema { "!reference", "from" )); - static ObjectWithInvalidNamedRefedPropertiesMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithInvalidNamedRefedPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithInvalidNamedRefedPropertiesMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 935ef05b9b8..5b8db59ceab 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 @@ -43,7 +43,7 @@ public class ObjectWithNonIntersectingValues1 implements JsonSchema { new AbstractMap.SimpleEntry>("a", A.class) )); static final Class additionalProperties = AdditionalProperties.class; - static ObjectWithNonIntersectingValuesMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithNonIntersectingValuesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithNonIntersectingValuesMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5502eb05085..111950152ce 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 @@ -50,7 +50,7 @@ public class ObjectWithOnlyOptionalProps1 implements JsonSchema { new AbstractMap.SimpleEntry>("b", B.class) )); static final Class additionalProperties = AdditionalProperties.class; - static ObjectWithOnlyOptionalPropsMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithOnlyOptionalPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOnlyOptionalPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 4b0bbec004c..5fb5e6cbe6e 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 @@ -38,7 +38,7 @@ public class ObjectWithOptionalTestProp1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("test", Test.class) )); - static ObjectWithOptionalTestPropMap getMapOutputInstance(FrozenMap arg) { + protected static ObjectWithOptionalTestPropMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOptionalTestPropMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 efe5207b876..da3ad0bf334 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 @@ -67,7 +67,7 @@ public class Order1 implements JsonSchema { new AbstractMap.SimpleEntry>("status", Status.class), new AbstractMap.SimpleEntry>("complete", Complete.class) )); - static OrderMap getMapOutputInstance(FrozenMap arg) { + protected static OrderMap getMapOutputInstance(FrozenMap arg) { return new OrderMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 a45af9854a4..2e7f8587e1e 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 @@ -62,7 +62,7 @@ public class PaginatedResultMyObjectDto1 implements JsonSchema { "results" )); static final Class additionalProperties = AdditionalProperties.class; - static PaginatedResultMyObjectDtoMap getMapOutputInstance(FrozenMap arg) { + protected static PaginatedResultMyObjectDtoMap getMapOutputInstance(FrozenMap arg) { return new PaginatedResultMyObjectDtoMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 a39a234fc4b..cdd4dc43be5 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 @@ -87,7 +87,7 @@ public class Pet1 implements JsonSchema { "name", "photoUrls" )); - static PetMap getMapOutputInstance(FrozenMap arg) { + protected static PetMap getMapOutputInstance(FrozenMap arg) { return new PetMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 03380025c01..b9df6fbc397 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 @@ -41,7 +41,7 @@ public class Player1 implements JsonSchema { new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("enemyPlayer", Player1.class) )); - static PlayerMap getMapOutputInstance(FrozenMap arg) { + protected static PlayerMap getMapOutputInstance(FrozenMap arg) { return new PlayerMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 fac7bccb633..b779a6de4f7 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 @@ -40,7 +40,7 @@ public class PublicKey1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("key", Key.class) )); - static PublicKeyMap getMapOutputInstance(FrozenMap arg) { + protected static PublicKeyMap getMapOutputInstance(FrozenMap arg) { return new PublicKeyMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 dfd0041f0fb..1f6c69dbb97 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 @@ -42,7 +42,7 @@ public class ReadOnlyFirst1 implements JsonSchema { new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("baz", Baz.class) )); - static ReadOnlyFirstMap getMapOutputInstance(FrozenMap arg) { + protected static ReadOnlyFirstMap getMapOutputInstance(FrozenMap arg) { return new ReadOnlyFirstMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 3524517037c..e7969388d1e 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 @@ -38,7 +38,7 @@ public class ReqPropsFromExplicitAddProps1 implements JsonSchema { "validName" )); static final Class additionalProperties = AdditionalProperties.class; - static ReqPropsFromExplicitAddPropsMap getMapOutputInstance(FrozenMap arg) { + protected static ReqPropsFromExplicitAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromExplicitAddPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 37b0daf6865..d3d0860825a 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 @@ -38,7 +38,7 @@ public class ReqPropsFromTrueAddProps1 implements JsonSchema { "validName" )); static final Class additionalProperties = AdditionalProperties.class; - static ReqPropsFromTrueAddPropsMap getMapOutputInstance(FrozenMap arg) { + protected static ReqPropsFromTrueAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromTrueAddPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 faaf260ba1d..1e0f3123671 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 @@ -33,7 +33,7 @@ public class ReqPropsFromUnsetAddProps1 implements JsonSchema { "invalid-name", "validName" )); - static ReqPropsFromUnsetAddPropsMap getMapOutputInstance(FrozenMap arg) { + protected static ReqPropsFromUnsetAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromUnsetAddPropsMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 1f1f2ab124d..b87464996d3 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 @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 1e54b8559e7..cc82fe512ce 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 @@ -35,7 +35,7 @@ public class SelfReferencingObjectModel1 implements JsonSchema { new AbstractMap.SimpleEntry>("selfRef", SelfReferencingObjectModel1.class) )); static final Class additionalProperties = SelfReferencingObjectModel1.class; - static SelfReferencingObjectModelMap getMapOutputInstance(FrozenMap arg) { + protected static SelfReferencingObjectModelMap getMapOutputInstance(FrozenMap arg) { return new SelfReferencingObjectModelMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 ebb21801f2a..22ccde98d88 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 @@ -42,7 +42,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); - static Schema1Map getMapOutputInstance(FrozenMap arg) { + protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } public static T validate(Map arg, SchemaConfiguration 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 44e8cd6b392..e3bf5c566ed 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 @@ -40,7 +40,7 @@ model with an invalid class name for python static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); - static SpecialModelnameMap getMapOutputInstance(FrozenMap arg) { + protected static SpecialModelnameMap getMapOutputInstance(FrozenMap arg) { return new SpecialModelnameMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d843373b420..d2240138e26 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 @@ -34,7 +34,7 @@ public class StringBooleanMap1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static StringBooleanMapMap getMapOutputInstance(FrozenMap arg) { + protected static StringBooleanMapMap getMapOutputInstance(FrozenMap arg) { return new StringBooleanMapMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 36803c234af..251d5f08f33 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 @@ -43,7 +43,7 @@ public class Tag1 implements JsonSchema { new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("name", Name.class) )); - static TagMap getMapOutputInstance(FrozenMap arg) { + protected static TagMap getMapOutputInstance(FrozenMap arg) { return new TagMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 1cfc7974e4e..3e6796aed9d 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 @@ -156,7 +156,7 @@ public class User1 implements JsonSchema { new AbstractMap.SimpleEntry>("anyTypeExceptNullProp", AnyTypeExceptNullProp.class), new AbstractMap.SimpleEntry>("anyTypePropNullable", AnyTypePropNullable.class) )); - static UserMap getMapOutputInstance(FrozenMap arg) { + protected static UserMap getMapOutputInstance(FrozenMap arg) { return new UserMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 4cb9cd547a6..60ff28bd634 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 @@ -55,7 +55,7 @@ public class Whale1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "className" )); - static WhaleMap getMapOutputInstance(FrozenMap arg) { + protected static WhaleMap getMapOutputInstance(FrozenMap arg) { return new WhaleMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 6472efd042e..fcb0028f297 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 @@ -61,7 +61,7 @@ public class Zebra1 implements JsonSchema { "className" )); static final Class additionalProperties = AdditionalProperties.class; - static ZebraMap getMapOutputInstance(FrozenMap arg) { + protected static ZebraMap getMapOutputInstance(FrozenMap arg) { return new ZebraMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 81ab6320843..4f66fa657aa 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 @@ -36,7 +36,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d62d897e431..66f10b67e31 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 e483e418a22..f3f233c7991 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 e5ce4a1ba64..b49ac3e4c25 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 @@ -36,7 +36,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("searchStr", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 082f132a7b4..ff54ac0edf2 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 @@ -36,7 +36,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 9aa498a08e6..ed1beb44bb0 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "subDir" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 3bc70ef42d1..9c41895a768 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 @@ -41,7 +41,7 @@ public class HeaderParameters1 implements JsonSchema { "required_boolean_group" )); static final Class additionalProperties = AdditionalProperties.class; - static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 b6e6af49a73..6422a96e1de 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 @@ -46,7 +46,7 @@ public class QueryParameters1 implements JsonSchema { "required_string_group" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 e6f4a4f4457..a53218987cf 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 @@ -38,7 +38,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_header_string_array", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 bc153752738..35ff37ba5c7 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 @@ -42,7 +42,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_query_string_array", Schema2.Schema21.class) )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5ccca19bd28..882a86896ff 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 @@ -59,7 +59,7 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("enum_form_string_array", EnumFormStringArray.class), new AbstractMap.SimpleEntry>("enum_form_string", EnumFormString.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 373d276d13b..eca706de006 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 @@ -205,7 +205,7 @@ public class Schema1 implements JsonSchema { "number", "pattern_without_delimiter" )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 89bce81af08..021d5d05fa0 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 @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "query" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 9261477596a..c10531e4f6a 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 @@ -45,7 +45,7 @@ public class QueryParameters1 implements JsonSchema { "some_var" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 75999efaa38..4748d082830 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "id" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 51a5564794e..7007a53f26b 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 @@ -28,7 +28,7 @@ public class Schema1 implements JsonSchema { FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 7c5e0a34507..dc642bb2779 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 @@ -38,7 +38,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("compositionInProperty", Schema1.Schema11.class) )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 8e6abe5e633..067821d158a 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 @@ -92,7 +92,7 @@ public class Schema11 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp1.class) )); - static SchemaMap1 getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap1 getMapOutputInstance(FrozenMap arg) { return new SchemaMap1(arg); } public static T validate(Map arg, SchemaConfiguration 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 a9b3b717653..88171a9e4ee 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 @@ -92,7 +92,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 969bbf555e7..a3ee3a860c7 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 @@ -92,7 +92,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 eead4597350..5ef5203497f 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 @@ -40,7 +40,7 @@ public class Schema1 implements JsonSchema { "param", "param2" )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 185846a61e9..fd022977927 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 @@ -32,7 +32,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 c5ae02c6cb0..7f975381152 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 @@ -32,7 +32,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("b", B.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 906ba100e17..344e4f557df 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 @@ -36,7 +36,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("mapBean", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 00d8faa08f4..8e6d0d89262 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 @@ -32,7 +32,7 @@ public class Schema01 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("keyword", Keyword0.class) )); - static SchemaMap0 getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap0 getMapOutputInstance(FrozenMap arg) { return new SchemaMap0(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 5289e0dccb2..09f0f767511 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 @@ -44,7 +44,7 @@ public class CookieParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema17.Schema171.class) )); static final Class additionalProperties = AdditionalProperties.class; - static CookieParametersMap getMapOutputInstance(FrozenMap arg) { + protected static CookieParametersMap getMapOutputInstance(FrozenMap arg) { return new CookieParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 84e7e41b9a7..5b456ace4ac 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 @@ -42,7 +42,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema7.Schema71.class) )); static final Class additionalProperties = AdditionalProperties.class; - static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 534a2fd146d..3a9cd4f93df 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 @@ -51,7 +51,7 @@ public class PathParameters1 implements JsonSchema { "self" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 4833b600d92..9c5f86d89c3 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 @@ -44,7 +44,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("self", Schema3.Schema31.class) )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 707ddcde12e..2f2d25b3e81 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 50917a90a25..443cf94b4a4 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 @@ -41,7 +41,7 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "requiredFile" )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 f2f1e82c030..7fca5bcda83 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 @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "someParam" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 cdcbf65872e..a87bb3012df 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 @@ -36,7 +36,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("mapBean", Foo.Foo1.class) )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 64979e0b7bd..edee80e367b 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 @@ -54,7 +54,7 @@ public class QueryParameters1 implements JsonSchema { "url" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 20b13ea344a..2b54ee96958 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 @@ -41,7 +41,7 @@ public class Schema1 implements JsonSchema { static final Set required = new LinkedHashSet<>(Set.of( "file" )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 c4ccec6223c..39ebd381c24 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 @@ -45,7 +45,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("files", Files.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 13620340e5f..75d9828fbe2 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 @@ -29,7 +29,7 @@ public class Schema1 implements JsonSchema { static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("string", Foo.Foo1.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 ce0ee63d563..0eae3e08582 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 @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "status" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 bca651775ef..592523bcbac 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 @@ -39,7 +39,7 @@ public class QueryParameters1 implements JsonSchema { "tags" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 0df2a557472..e4fd4294a66 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 @@ -36,7 +36,7 @@ public class HeaderParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("api_key", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; - static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { + protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 7d6c6247c7e..822962cdc33 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 424534a9147..d8dd8b988fe 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 823d5e35973..ac944850034 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 f487b3c6dfa..e586269fd5d 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 @@ -36,7 +36,7 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("status", Status.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 49a04a92bda..5294825d26c 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "petId" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 07e941ec8fd..dda0f7fa592 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 @@ -38,7 +38,7 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("additionalMetadata", AdditionalMetadata.class), new AbstractMap.SimpleEntry>("file", File.class) )); - static SchemaMap getMapOutputInstance(FrozenMap arg) { + protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 f5f2c65a881..f55b2b8c865 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "order_id" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 e84139ff442..d5cd1bf9409 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "order_id" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 d9f61c08704..77b4bb5d34d 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 @@ -42,7 +42,7 @@ public class QueryParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - static QueryParametersMap getMapOutputInstance(FrozenMap arg) { + protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 4d83f3c91a7..7d228d6c95d 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 @@ -49,7 +49,7 @@ public class Headers1 implements JsonSchema { "ref-content-schema-header" )); static final Class additionalProperties = AdditionalProperties.class; - static HeadersMap getMapOutputInstance(FrozenMap arg) { + protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 8be473a57b7..837a81f2ca4 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration 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 df299442e1b..f0e2dc0c67c 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { 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 81c1d9584a5..e7819a04ea3 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 @@ -39,7 +39,7 @@ public class PathParameters1 implements JsonSchema { "username" )); static final Class additionalProperties = AdditionalProperties.class; - static PathParametersMap getMapOutputInstance(FrozenMap arg) { + protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } public static T validate(Map arg, SchemaConfiguration configuration) { diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs index e5412bf3d14..786092d65e5 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs @@ -69,7 +69,7 @@ public class {{jsonPathPiece.camelCase}} implements JsonSchema { {{!> components/schemas/schema_cls/_unevaluated_properties }} {{/if}} {{#if mapOutputJsonPathPiece}} - static {{mapOutputJsonPathPiece.camelCase}} getMapOutputInstance(FrozenMap arg) { + protected static {{mapOutputJsonPathPiece.camelCase}} getMapOutputInstance(FrozenMap arg) { return new {{mapOutputJsonPathPiece.camelCase}}(arg); } {{/if}} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs index 928398cefba..3d145e678a5 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs @@ -31,7 +31,7 @@ {{> src/main/java/org/openapitools/components/schemas/_objectOutputType }} {{else}} {{#eq instanceType "arrayOutputType" }} -{{!> components/schemas/_array_output_type }} +{{!> components/schemas/_arrayOutputType }} {{else}} {{#eq instanceType "arrayInputType" }} {{!> components/schemas/_array_input_type }} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_arrayOutputType.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_arrayOutputType.hbs new file mode 100644 index 00000000000..ab04019b7bd --- /dev/null +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/_arrayOutputType.hbs @@ -0,0 +1,7 @@ + + +public static class {{arrayOutputJsonPathPiece.camelCase}} extends FrozenList<{{#with items}}{{!> components/schemas/types/schema_output_type mode="unprefixed" fullRefModule="" endChar="]):" }}{{/with}}Object> { + {{arrayOutputJsonPathPiece.camelCase}}(FrozenList m) { + super(m); + } +} \ No newline at end of file From 6bc00605a953710dedb598cd37a83f345f0b1e50 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 19 Nov 2023 09:32:49 -0800 Subject: [PATCH 06/15] Adds Array output types --- .../content/applicationjson/Schema.java | 6 ++++ .../content/applicationjson/Schema.java | 6 ++++ .../content/applicationxml/Schema.java | 6 ++++ .../AdditionalPropertiesWithArrayOfEnums.java | 6 ++++ .../components/schemas/AnimalFarm.java | 6 ++++ .../schemas/ArrayHoldingAnyType.java | 6 ++++ .../schemas/ArrayOfArrayOfNumberOnly.java | 12 ++++++++ .../components/schemas/ArrayOfEnums.java | 6 ++++ .../components/schemas/ArrayOfNumberOnly.java | 6 ++++ .../components/schemas/ArrayTest.java | 30 +++++++++++++++++++ .../schemas/ArrayWithValidationsInItems.java | 6 ++++ ...posedAnyOfDifferentTypesNoValidations.java | 6 ++++ .../components/schemas/ComposedArray.java | 6 ++++ .../schemas/ComposedOneOfDifferentTypes.java | 6 ++++ .../components/schemas/Drawing.java | 6 ++++ .../components/schemas/EnumArrays.java | 6 ++++ .../schemas/FileSchemaTestClass.java | 6 ++++ .../components/schemas/FormatTest.java | 6 ++++ .../components/schemas/Items.java | 6 ++++ .../components/schemas/JSONPatchRequest.java | 6 ++++ .../components/schemas/NullableClass.java | 18 +++++++++++ .../schemas/PaginatedResultMyObjectDto.java | 6 ++++ .../components/schemas/Pet.java | 12 ++++++++ .../schemas/SelfReferencingArrayModel.java | 6 ++++ .../get/parameters/parameter0/Schema0.java | 6 ++++ .../get/parameters/parameter2/Schema2.java | 6 ++++ .../applicationxwwwformurlencoded/Schema.java | 6 ++++ .../put/parameters/parameter0/Schema0.java | 6 ++++ .../put/parameters/parameter1/Schema1.java | 6 ++++ .../put/parameters/parameter2/Schema2.java | 6 ++++ .../put/parameters/parameter3/Schema3.java | 6 ++++ .../put/parameters/parameter4/Schema4.java | 6 ++++ .../content/multipartformdata/Schema.java | 6 ++++ .../get/parameters/parameter0/Schema0.java | 6 ++++ .../get/parameters/parameter0/Schema0.java | 6 ++++ .../components/schemas/Schema_getSchemas.hbs | 2 +- 36 files changed, 259 insertions(+), 1 deletion(-) 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 1245ef57219..5a06a52e973 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 @@ -11,6 +11,12 @@ public class Schema { // nest classes so all schemas and input/output classes can be public + public static class SchemaTuple extends FrozenList { + SchemaTuple(FrozenList m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 ee9176dec38..753c26db760 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 @@ -12,6 +12,12 @@ public class Schema { // nest classes so all schemas and input/output classes can be public + public static class SchemaTuple extends FrozenList { + SchemaTuple(FrozenList m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 91336cac1dc..c89f268b4c2 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 @@ -11,6 +11,12 @@ public class Schema { // nest classes so all schemas and input/output classes can be public + public static class SchemaTuple extends FrozenList { + SchemaTuple(FrozenList m) { + super(m); + } + } + public class Schema1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 5ee42e6585a..abc542429f1 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 @@ -12,6 +12,12 @@ public class AdditionalPropertiesWithArrayOfEnums { // nest classes so all schemas and input/output classes can be public + public static class AdditionalPropertiesTuple extends FrozenList { + AdditionalPropertiesTuple(FrozenList m) { + super(m); + } + } + public class AdditionalProperties implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 6080f078ea1..d1e2408ae3e 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 @@ -10,6 +10,12 @@ public class AnimalFarm { // nest classes so all schemas and input/output classes can be public + public static class AnimalFarmTuple extends FrozenList { + AnimalFarmTuple(FrozenList m) { + super(m); + } + } + public class AnimalFarm1 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/ArrayHoldingAnyType.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayHoldingAnyType.java index 5af7c265cd2..25f5302b798 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 @@ -14,6 +14,12 @@ public class ArrayHoldingAnyType { public class Items extends AnyTypeJsonSchema {} + public static class ArrayHoldingAnyTypeTuple extends FrozenList { + ArrayHoldingAnyTypeTuple(FrozenList m) { + super(m); + } + } + public class ArrayHoldingAnyType1 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/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java index 6382d6d0d17..848402d7c48 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 @@ -18,6 +18,12 @@ public class ArrayOfArrayOfNumberOnly { public class Items1 extends NumberJsonSchema {} + public static class ItemsTuple extends FrozenList { + ItemsTuple(FrozenList m) { + super(m); + } + } + public class Items implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class @@ -28,6 +34,12 @@ public static U validate(List arg, SchemaConfigur } } + public static class ArrayArrayNumberTuple extends FrozenList { + ArrayArrayNumberTuple(FrozenList m) { + super(m); + } + } + public class ArrayArrayNumber implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 d9ba5c570f0..a669c752c52 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 @@ -10,6 +10,12 @@ public class ArrayOfEnums { // nest classes so all schemas and input/output classes can be public + public static class ArrayOfEnumsTuple extends FrozenList { + ArrayOfEnumsTuple(FrozenList m) { + super(m); + } + } + public class ArrayOfEnums1 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/ArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfNumberOnly.java index 707d85f8e91..5293dbcfe0a 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 @@ -18,6 +18,12 @@ public class ArrayOfNumberOnly { public class Items extends NumberJsonSchema {} + public static class ArrayNumberTuple extends FrozenList { + ArrayNumberTuple(FrozenList m) { + super(m); + } + } + public class ArrayNumber implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 e254bab9f6d..b1897445637 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 @@ -19,6 +19,12 @@ public class ArrayTest { public class Items extends StringJsonSchema {} + public static class ArrayOfStringTuple extends FrozenList { + ArrayOfStringTuple(FrozenList m) { + super(m); + } + } + public class ArrayOfString implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class @@ -32,6 +38,12 @@ public static U validate(List arg, SchemaConfigur public class Items2 extends Int64JsonSchema {} + public static class ItemsTuple extends FrozenList { + ItemsTuple(FrozenList m) { + super(m); + } + } + public class Items1 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class @@ -42,6 +54,12 @@ public static U validate(List arg, SchemaConfigur } } + public static class ArrayArrayOfIntegerTuple extends FrozenList { + ArrayArrayOfIntegerTuple(FrozenList m) { + super(m); + } + } + public class ArrayArrayOfInteger implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class @@ -52,6 +70,12 @@ public static U validate(List arg, SchemaConfigur } } + public static class ItemsTuple1 extends FrozenList { + ItemsTuple1(FrozenList m) { + super(m); + } + } + public class Items3 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class @@ -62,6 +86,12 @@ public static U validate(List arg, SchemaConfigur } } + public static class ArrayArrayOfModelTuple extends FrozenList { + ArrayArrayOfModelTuple(FrozenList m) { + super(m); + } + } + public class ArrayArrayOfModel implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 49d690f17a9..c6e8b6f2fe1 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 @@ -35,6 +35,12 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } + public static class ArrayWithValidationsInItemsTuple extends FrozenList { + ArrayWithValidationsInItemsTuple(FrozenList m) { + super(m); + } + } + public class ArrayWithValidationsInItems1 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/ComposedAnyOfDifferentTypesNoValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedAnyOfDifferentTypesNoValidations.java index 3f2a9180454..c347037b6dc 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 @@ -60,6 +60,12 @@ public class Schema8 extends NullJsonSchema {} public class Items extends AnyTypeJsonSchema {} + public static class Schema9Tuple extends FrozenList { + Schema9Tuple(FrozenList m) { + super(m); + } + } + public class Schema9 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 c85b3e2e354..2883d359ad6 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 @@ -14,6 +14,12 @@ public class ComposedArray { public class Items extends AnyTypeJsonSchema {} + public static class ComposedArrayTuple extends FrozenList { + ComposedArrayTuple(FrozenList m) { + super(m); + } + } + public class ComposedArray1 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/ComposedOneOfDifferentTypes.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedOneOfDifferentTypes.java index b870693ee07..fa50e2c7351 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 @@ -37,6 +37,12 @@ public static T validate(Map arg, SchemaCo public class Items extends AnyTypeJsonSchema {} + public static class Schema5Tuple extends FrozenList { + Schema5Tuple(FrozenList m) { + super(m); + } + } + public class Schema5 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 97923dbae75..ce0be93d7e2 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 @@ -14,6 +14,12 @@ public class Drawing { // nest classes so all schemas and input/output classes can be public + public static class ShapesTuple extends FrozenList { + ShapesTuple(FrozenList m) { + super(m); + } + } + public class Shapes implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 591e5d6ab37..e3a40847b56 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 @@ -32,6 +32,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + public static class ArrayEnumTuple extends FrozenList { + ArrayEnumTuple(FrozenList m) { + super(m); + } + } + public class ArrayEnum implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 d0fca00bb3e..7f8db3314e2 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 @@ -14,6 +14,12 @@ public class FileSchemaTestClass { // nest classes so all schemas and input/output classes can be public + public static class FilesTuple extends FrozenList { + FilesTuple(FrozenList m) { + super(m); + } + } + public class Files implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 132a5928daf..896631394af 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 @@ -138,6 +138,12 @@ public class Float64 extends DoubleJsonSchema {} public class Items extends NumberJsonSchema {} + public static class ArrayWithUniqueItemsTuple extends FrozenList { + ArrayWithUniqueItemsTuple(FrozenList m) { + super(m); + } + } + public class ArrayWithUniqueItems implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 2b3300789d0..f0994da1e2d 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 @@ -14,6 +14,12 @@ public class Items { public class Items2 extends MapJsonSchema {} + public static class ItemsTuple extends FrozenList { + ItemsTuple(FrozenList m) { + super(m); + } + } + public class Items1 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/JSONPatchRequest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequest.java index d3f7b85936b..53f084be798 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 @@ -65,6 +65,12 @@ public static U validate(List arg, SchemaConfigur } } + public static class JSONPatchRequestTuple extends FrozenList { + JSONPatchRequestTuple(FrozenList m) { + super(m); + } + } + public class JSONPatchRequest1 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/NullableClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableClass.java index 293aaf7658d..fcb4cb501c9 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 @@ -143,6 +143,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class Items extends MapJsonSchema {} + public static class ArrayNullablePropTuple extends FrozenList { + ArrayNullablePropTuple(FrozenList m) { + super(m); + } + } + public class ArrayNullableProp implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, @@ -170,6 +176,12 @@ public static T validate(Map arg, SchemaCo } } + public static class ArrayAndItemsNullablePropTuple extends FrozenList { + ArrayAndItemsNullablePropTuple(FrozenList m) { + super(m); + } + } + public class ArrayAndItemsNullableProp implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, @@ -197,6 +209,12 @@ public static T validate(Map arg, SchemaCo } } + public static class ArrayItemsNullableTuple extends FrozenList { + ArrayItemsNullableTuple(FrozenList m) { + super(m); + } + } + public class ArrayItemsNullable implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 2e7f8587e1e..b08a041328b 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 @@ -24,6 +24,12 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} public class Count extends IntJsonSchema {} + public static class ResultsTuple extends FrozenList { + ResultsTuple(FrozenList m) { + super(m); + } + } + public class Results implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 cdd4dc43be5..d5973df1dfd 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 @@ -25,6 +25,12 @@ public class Name extends StringJsonSchema {} public class Items extends StringJsonSchema {} + public static class PhotoUrlsTuple extends FrozenList { + PhotoUrlsTuple(FrozenList m) { + super(m); + } + } + public class PhotoUrls implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class @@ -44,6 +50,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + public static class TagsTuple extends FrozenList { + TagsTuple(FrozenList m) { + super(m); + } + } + public class Tags implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 cc9dd17d366..7d62a854b96 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 @@ -10,6 +10,12 @@ public class SelfReferencingArrayModel { // nest classes so all schemas and input/output classes can be public + public static class SelfReferencingArrayModelTuple extends FrozenList { + SelfReferencingArrayModelTuple(FrozenList m) { + super(m); + } + } + public class SelfReferencingArrayModel1 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/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 016fa5f9f8e..10e514a51c3 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 @@ -19,6 +19,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + public static class SchemaTuple0 extends FrozenList { + SchemaTuple0(FrozenList m) { + super(m); + } + } + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 5877e766c5e..f702ef49eda 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 @@ -19,6 +19,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + public static class SchemaTuple2 extends FrozenList { + SchemaTuple2(FrozenList m) { + super(m); + } + } + public class Schema21 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 882a86896ff..21b4af62443 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 @@ -23,6 +23,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + public static class EnumFormStringArrayTuple extends FrozenList { + EnumFormStringArrayTuple(FrozenList m) { + super(m); + } + } + public class EnumFormStringArray implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 db1e281a96f..ff4a073c61e 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 @@ -14,6 +14,12 @@ public class Schema0 { public class Items0 extends StringJsonSchema {} + public static class SchemaTuple0 extends FrozenList { + SchemaTuple0(FrozenList m) { + super(m); + } + } + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 643abbcb5f3..24aedac38c1 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 @@ -14,6 +14,12 @@ public class Schema1 { public class Items1 extends StringJsonSchema {} + public static class SchemaTuple1 extends FrozenList { + SchemaTuple1(FrozenList m) { + super(m); + } + } + public class Schema11 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 a1c93217aa8..5775df5eb38 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 @@ -14,6 +14,12 @@ public class Schema2 { public class Items2 extends StringJsonSchema {} + public static class SchemaTuple2 extends FrozenList { + SchemaTuple2(FrozenList m) { + super(m); + } + } + public class Schema21 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 8e1584fa523..31342d61813 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 @@ -14,6 +14,12 @@ public class Schema3 { public class Items3 extends StringJsonSchema {} + public static class SchemaTuple3 extends FrozenList { + SchemaTuple3(FrozenList m) { + super(m); + } + } + public class Schema31 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 4540361150b..d36bb78a1ca 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 @@ -14,6 +14,12 @@ public class Schema4 { public class Items4 extends StringJsonSchema {} + public static class SchemaTuple4 extends FrozenList { + SchemaTuple4(FrozenList m) { + super(m); + } + } + public class Schema41 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 39ebd381c24..d2bbe0e5d85 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 @@ -19,6 +19,12 @@ public class Items implements JsonSchema { } + public static class FilesTuple extends FrozenList { + FilesTuple(FrozenList m) { + super(m); + } + } + public class Files implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 9aba7e764b7..a3db17886b8 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 @@ -19,6 +19,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } + public static class SchemaTuple0 extends FrozenList { + SchemaTuple0(FrozenList m) { + super(m); + } + } + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class 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 b9256a0b08b..64e0d186d5f 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 @@ -14,6 +14,12 @@ public class Schema0 { public class Items0 extends StringJsonSchema {} + public static class SchemaTuple0 extends FrozenList { + SchemaTuple0(FrozenList m) { + super(m); + } + } + public class Schema01 implements JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs index 3d145e678a5..ac44ff975e4 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/Schema_getSchemas.hbs @@ -31,7 +31,7 @@ {{> src/main/java/org/openapitools/components/schemas/_objectOutputType }} {{else}} {{#eq instanceType "arrayOutputType" }} -{{!> components/schemas/_arrayOutputType }} +{{> src/main/java/org/openapitools/components/schemas/_arrayOutputType }} {{else}} {{#eq instanceType "arrayInputType" }} {{!> components/schemas/_array_input_type }} From 74bd199c256f45eee7b174e4fac6cbbe60af7a5f Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 19 Nov 2023 09:40:22 -0800 Subject: [PATCH 07/15] Adds array output class --- .../userarray/content/applicationjson/Schema.java | 3 +++ .../content/applicationjson/Schema.java | 3 +++ .../content/applicationxml/Schema.java | 3 +++ .../AdditionalPropertiesWithArrayOfEnums.java | 3 +++ .../components/schemas/AnimalFarm.java | 3 +++ .../components/schemas/ArrayHoldingAnyType.java | 3 +++ .../schemas/ArrayOfArrayOfNumberOnly.java | 6 ++++++ .../components/schemas/ArrayOfEnums.java | 3 +++ .../components/schemas/ArrayOfNumberOnly.java | 3 +++ .../components/schemas/ArrayTest.java | 15 +++++++++++++++ .../schemas/ArrayWithValidationsInItems.java | 3 +++ .../ComposedAnyOfDifferentTypesNoValidations.java | 3 +++ .../components/schemas/ComposedArray.java | 3 +++ .../schemas/ComposedOneOfDifferentTypes.java | 3 +++ .../components/schemas/Drawing.java | 3 +++ .../components/schemas/EnumArrays.java | 3 +++ .../components/schemas/FileSchemaTestClass.java | 3 +++ .../components/schemas/FormatTest.java | 3 +++ .../components/schemas/Items.java | 3 +++ .../components/schemas/JSONPatchRequest.java | 3 +++ .../components/schemas/NullableClass.java | 3 +++ .../schemas/PaginatedResultMyObjectDto.java | 3 +++ .../components/schemas/Pet.java | 6 ++++++ .../schemas/SelfReferencingArrayModel.java | 3 +++ .../fake/get/parameters/parameter0/Schema0.java | 3 +++ .../fake/get/parameters/parameter2/Schema2.java | 3 +++ .../applicationxwwwformurlencoded/Schema.java | 3 +++ .../put/parameters/parameter0/Schema0.java | 3 +++ .../put/parameters/parameter1/Schema1.java | 3 +++ .../put/parameters/parameter2/Schema2.java | 3 +++ .../put/parameters/parameter3/Schema3.java | 3 +++ .../put/parameters/parameter4/Schema4.java | 3 +++ .../content/multipartformdata/Schema.java | 3 +++ .../get/parameters/parameter0/Schema0.java | 3 +++ .../get/parameters/parameter0/Schema0.java | 3 +++ .../schemas/ArrayTypeSchemaTest.java | 2 +- .../schemas/SchemaClass/_Schema_list.hbs | 3 +++ .../openapitools/schemas/ArrayTypeSchemaTest.hbs | 2 +- 38 files changed, 128 insertions(+), 2 deletions(-) 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 5a06a52e973..296d8e74d83 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 @@ -22,6 +22,9 @@ public class Schema1 implements JsonSchema { FrozenList.class )); static final Class items = User.User1.class; + protected static SchemaTuple getListOutputInstance(FrozenList arg) { + return new SchemaTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } 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 753c26db760..18cbf4e018b 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 @@ -23,6 +23,9 @@ public class Schema1 implements JsonSchema { FrozenList.class )); static final Class items = RefPet.RefPet1.class; + protected static SchemaTuple getListOutputInstance(FrozenList arg) { + return new SchemaTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } 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 c89f268b4c2..1c45392c242 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 @@ -22,6 +22,9 @@ public class Schema1 implements JsonSchema { FrozenList.class )); static final Class items = Pet.Pet1.class; + protected static SchemaTuple getListOutputInstance(FrozenList arg) { + return new SchemaTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 abc542429f1..669a05a0d22 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 @@ -23,6 +23,9 @@ public class AdditionalProperties implements JsonSchema { FrozenList.class )); static final Class items = EnumClass.EnumClass1.class; + protected static AdditionalPropertiesTuple getListOutputInstance(FrozenList arg) { + return new AdditionalPropertiesTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties.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 d1e2408ae3e..f1d3bc348f5 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 @@ -27,6 +27,9 @@ public class AnimalFarm1 implements JsonSchema { FrozenList.class )); static final Class items = Animal.Animal1.class; + protected static AnimalFarmTuple getListOutputInstance(FrozenList arg) { + return new AnimalFarmTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnimalFarm1.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 25f5302b798..3031e7e580b 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 @@ -31,6 +31,9 @@ public class ArrayHoldingAnyType1 implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ArrayHoldingAnyTypeTuple getListOutputInstance(FrozenList arg) { + return new ArrayHoldingAnyTypeTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayHoldingAnyType1.class, arg, configuration); } 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 848402d7c48..0f78b759bd8 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 @@ -29,6 +29,9 @@ public class Items implements JsonSchema { FrozenList.class )); static final Class items = Items1.class; + protected static ItemsTuple getListOutputInstance(FrozenList arg) { + return new ItemsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items.class, arg, configuration); } @@ -45,6 +48,9 @@ public class ArrayArrayNumber implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ArrayArrayNumberTuple getListOutputInstance(FrozenList arg) { + return new ArrayArrayNumberTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayArrayNumber.class, arg, configuration); } 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 a669c752c52..9f413427fae 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 @@ -27,6 +27,9 @@ public class ArrayOfEnums1 implements JsonSchema { FrozenList.class )); static final Class items = StringEnum.StringEnum1.class; + protected static ArrayOfEnumsTuple getListOutputInstance(FrozenList arg) { + return new ArrayOfEnumsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfEnums1.class, arg, configuration); } 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 5293dbcfe0a..ad4ece8ad58 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 @@ -29,6 +29,9 @@ public class ArrayNumber implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ArrayNumberTuple getListOutputInstance(FrozenList arg) { + return new ArrayNumberTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayNumber.class, arg, configuration); } 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 b1897445637..fa48d2f5678 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 @@ -30,6 +30,9 @@ public class ArrayOfString implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ArrayOfStringTuple getListOutputInstance(FrozenList arg) { + return new ArrayOfStringTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfString.class, arg, configuration); } @@ -49,6 +52,9 @@ public class Items1 implements JsonSchema { FrozenList.class )); static final Class items = Items2.class; + protected static ItemsTuple getListOutputInstance(FrozenList arg) { + return new ItemsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items1.class, arg, configuration); } @@ -65,6 +71,9 @@ public class ArrayArrayOfInteger implements JsonSchema { FrozenList.class )); static final Class items = Items1.class; + protected static ArrayArrayOfIntegerTuple getListOutputInstance(FrozenList arg) { + return new ArrayArrayOfIntegerTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayArrayOfInteger.class, arg, configuration); } @@ -81,6 +90,9 @@ public class Items3 implements JsonSchema { FrozenList.class )); static final Class items = ReadOnlyFirst.ReadOnlyFirst1.class; + protected static ItemsTuple1 getListOutputInstance(FrozenList arg) { + return new ItemsTuple1(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items3.class, arg, configuration); } @@ -97,6 +109,9 @@ public class ArrayArrayOfModel implements JsonSchema { FrozenList.class )); static final Class items = Items3.class; + protected static ArrayArrayOfModelTuple getListOutputInstance(FrozenList arg) { + return new ArrayArrayOfModelTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayArrayOfModel.class, arg, configuration); } 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 c6e8b6f2fe1..f5ee0706fc5 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 @@ -52,6 +52,9 @@ public class ArrayWithValidationsInItems1 implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ArrayWithValidationsInItemsTuple getListOutputInstance(FrozenList arg) { + return new ArrayWithValidationsInItemsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayWithValidationsInItems1.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 c347037b6dc..69d00761b89 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 @@ -71,6 +71,9 @@ public class Schema9 implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static Schema9Tuple getListOutputInstance(FrozenList arg) { + return new Schema9Tuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema9.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 2883d359ad6..b1fe7e2518c 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 @@ -31,6 +31,9 @@ public class ComposedArray1 implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ComposedArrayTuple getListOutputInstance(FrozenList arg) { + return new ComposedArrayTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ComposedArray1.class, arg, configuration); } 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 fa50e2c7351..8f269073d73 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 @@ -48,6 +48,9 @@ public class Schema5 implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static Schema5Tuple getListOutputInstance(FrozenList arg) { + return new Schema5Tuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema5.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 ce0be93d7e2..8cd68165b89 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 @@ -25,6 +25,9 @@ public class Shapes implements JsonSchema { FrozenList.class )); static final Class items = Shape.Shape1.class; + protected static ShapesTuple getListOutputInstance(FrozenList arg) { + return new ShapesTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Shapes.class, arg, configuration); } 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 e3a40847b56..d00266bbb6d 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 @@ -43,6 +43,9 @@ public class ArrayEnum implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ArrayEnumTuple getListOutputInstance(FrozenList arg) { + return new ArrayEnumTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayEnum.class, arg, configuration); } 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 7f8db3314e2..007f5c37883 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 @@ -25,6 +25,9 @@ public class Files implements JsonSchema { FrozenList.class )); static final Class items = File.File1.class; + protected static FilesTuple getListOutputInstance(FrozenList arg) { + return new FilesTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Files.class, arg, configuration); } 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 896631394af..31d6d83ab2e 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 @@ -149,6 +149,9 @@ public class ArrayWithUniqueItems implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static ArrayWithUniqueItemsTuple getListOutputInstance(FrozenList arg) { + return new ArrayWithUniqueItemsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayWithUniqueItems.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 f0994da1e2d..a32562bb690 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 @@ -33,6 +33,9 @@ public class Items1 implements JsonSchema { FrozenList.class )); static final Class items = Items2.class; + protected static ItemsTuple getListOutputInstance(FrozenList arg) { + return new ItemsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items1.class, arg, configuration); } 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 53f084be798..1024069dc1f 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 @@ -82,6 +82,9 @@ public class JSONPatchRequest1 implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static JSONPatchRequestTuple getListOutputInstance(FrozenList arg) { + return new JSONPatchRequestTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(JSONPatchRequest1.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 fcb4cb501c9..b2934f16e15 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 @@ -220,6 +220,9 @@ public class ArrayItemsNullable implements JsonSchema { FrozenList.class )); static final Class items = Items2.class; + protected static ArrayItemsNullableTuple getListOutputInstance(FrozenList arg) { + return new ArrayItemsNullableTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayItemsNullable.class, arg, configuration); } 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 b08a041328b..0927944444f 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 @@ -35,6 +35,9 @@ public class Results implements JsonSchema { FrozenList.class )); static final Class items = MyObjectDto.MyObjectDto1.class; + protected static ResultsTuple getListOutputInstance(FrozenList arg) { + return new ResultsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Results.class, arg, configuration); } 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 d5973df1dfd..16ae34574b9 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 @@ -36,6 +36,9 @@ public class PhotoUrls implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static PhotoUrlsTuple getListOutputInstance(FrozenList arg) { + return new PhotoUrlsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(PhotoUrls.class, arg, configuration); } @@ -61,6 +64,9 @@ public class Tags implements JsonSchema { FrozenList.class )); static final Class items = Tag.Tag1.class; + protected static TagsTuple getListOutputInstance(FrozenList arg) { + return new TagsTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Tags.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 7d62a854b96..9291351fb93 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 @@ -27,6 +27,9 @@ public class SelfReferencingArrayModel1 implements JsonSchema { FrozenList.class )); static final Class items = SelfReferencingArrayModel1.class; + protected static SelfReferencingArrayModelTuple getListOutputInstance(FrozenList arg) { + return new SelfReferencingArrayModelTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(SelfReferencingArrayModel1.class, arg, configuration); } 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 10e514a51c3..961c73f974f 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 @@ -30,6 +30,9 @@ public class Schema01 implements JsonSchema { FrozenList.class )); static final Class items = Items0.class; + protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { + return new SchemaTuple0(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, arg, configuration); } 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 f702ef49eda..b1b62560eaf 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 @@ -30,6 +30,9 @@ public class Schema21 implements JsonSchema { FrozenList.class )); static final Class items = Items2.class; + protected static SchemaTuple2 getListOutputInstance(FrozenList arg) { + return new SchemaTuple2(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema21.class, arg, configuration); } 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 21b4af62443..643b3fedd1e 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 @@ -34,6 +34,9 @@ public class EnumFormStringArray implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static EnumFormStringArrayTuple getListOutputInstance(FrozenList arg) { + return new EnumFormStringArrayTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(EnumFormStringArray.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 ff4a073c61e..55c74df62c1 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 @@ -25,6 +25,9 @@ public class Schema01 implements JsonSchema { FrozenList.class )); static final Class items = Items0.class; + protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { + return new SchemaTuple0(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, arg, configuration); } 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 24aedac38c1..25388bb3bbb 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 @@ -25,6 +25,9 @@ public class Schema11 implements JsonSchema { FrozenList.class )); static final Class items = Items1.class; + protected static SchemaTuple1 getListOutputInstance(FrozenList arg) { + return new SchemaTuple1(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema11.class, arg, configuration); } 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 5775df5eb38..3888c22c60b 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 @@ -25,6 +25,9 @@ public class Schema21 implements JsonSchema { FrozenList.class )); static final Class items = Items2.class; + protected static SchemaTuple2 getListOutputInstance(FrozenList arg) { + return new SchemaTuple2(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema21.class, arg, configuration); } 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 31342d61813..2e900e9c278 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 @@ -25,6 +25,9 @@ public class Schema31 implements JsonSchema { FrozenList.class )); static final Class items = Items3.class; + protected static SchemaTuple3 getListOutputInstance(FrozenList arg) { + return new SchemaTuple3(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema31.class, arg, configuration); } 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 d36bb78a1ca..e9b3d8c052b 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 @@ -25,6 +25,9 @@ public class Schema41 implements JsonSchema { FrozenList.class )); static final Class items = Items4.class; + protected static SchemaTuple4 getListOutputInstance(FrozenList arg) { + return new SchemaTuple4(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema41.class, arg, configuration); } 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 d2bbe0e5d85..dc155a1957a 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 @@ -30,6 +30,9 @@ public class Files implements JsonSchema { FrozenList.class )); static final Class items = Items.class; + protected static FilesTuple getListOutputInstance(FrozenList arg) { + return new FilesTuple(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Files.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 a3db17886b8..d86908af833 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 @@ -30,6 +30,9 @@ public class Schema01 implements JsonSchema { FrozenList.class )); static final Class items = Items0.class; + protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { + return new SchemaTuple0(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.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 64e0d186d5f..ad0f7a3555c 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 @@ -25,6 +25,9 @@ public class Schema01 implements JsonSchema { FrozenList.class )); static final Class items = Items0.class; + protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { + return new SchemaTuple0(arg); + } public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java index 85453b94cd4..1bc2c43d684 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java @@ -37,7 +37,7 @@ class ArrayWithOutputClsSchema implements JsonSchema { )); static final Class items = StringJsonSchema.class; - public static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { + protected static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { return new ArrayWithOutputClsSchemaList(arg); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs index a12bba28503..e3c58f1d020 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs @@ -60,6 +60,9 @@ public class {{jsonPathPiece.camelCase}} implements JsonSchema { {{!> components/schemas/schema_cls/_unevaluated_items }} {{/if}} {{#if arrayOutputJsonPathPiece}} + protected static {{arrayOutputJsonPathPiece.camelCase}} getListOutputInstance(FrozenList arg) { + return new {{arrayOutputJsonPathPiece.camelCase}}(arg); + } {{/if}} {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_validate }} } \ No newline at end of file diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs index d700cf512d3..8c14ab5019a 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs @@ -37,7 +37,7 @@ class ArrayWithOutputClsSchema implements JsonSchema { )); static final Class items = StringJsonSchema.class; - public static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { + protected static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { return new ArrayWithOutputClsSchemaList(arg); } From 826b6fc7237cd56d22da83cd389b6fc59d8822d2 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 19 Nov 2023 11:38:48 -0800 Subject: [PATCH 08/15] Refactors validation logic to protect SchemaValidator validate method --- .../petstore/java/.openapi-generator/FILES | 40 +-- .../content/applicationjson/Schema.java | 6 +- .../responses/headerswithnobody/Headers.java | 6 +- .../content/applicationjson/Schema.java | 6 +- .../content/applicationxml/Schema.java | 6 +- .../Headers.java | 6 +- .../content/applicationjson/Schema.java | 4 +- .../successwithjsonapiresponse/Headers.java | 8 +- .../schemas/AbstractStepMessage.java | 8 +- .../schemas/AdditionalPropertiesClass.java | 30 +- .../AdditionalPropertiesValidator.java | 20 +- .../AdditionalPropertiesWithArrayOfEnums.java | 10 +- .../components/schemas/Address.java | 4 +- .../components/schemas/Animal.java | 12 +- .../components/schemas/AnimalFarm.java | 6 +- .../components/schemas/AnyTypeAndFormat.java | 42 +-- .../components/schemas/AnyTypeNotString.java | 2 +- .../components/schemas/ApiResponseSchema.java | 6 +- .../components/schemas/Apple.java | 16 +- .../components/schemas/AppleReq.java | 8 +- .../schemas/ArrayHoldingAnyType.java | 6 +- .../schemas/ArrayOfArrayOfNumberOnly.java | 18 +- .../components/schemas/ArrayOfEnums.java | 6 +- .../components/schemas/ArrayOfNumberOnly.java | 12 +- .../components/schemas/ArrayTest.java | 36 +- .../schemas/ArrayWithValidationsInItems.java | 12 +- .../components/schemas/Banana.java | 8 +- .../components/schemas/BananaReq.java | 8 +- .../components/schemas/Bar.java | 4 +- .../components/schemas/BasquePig.java | 12 +- .../components/schemas/BooleanEnum.java | 4 +- .../components/schemas/Capitalization.java | 6 +- .../components/schemas/Cat.java | 8 +- .../components/schemas/Category.java | 12 +- .../components/schemas/ChildCat.java | 8 +- .../components/schemas/ClassModel.java | 4 +- .../components/schemas/Client.java | 6 +- .../schemas/ComplexQuadrilateral.java | 12 +- ...posedAnyOfDifferentTypesNoValidations.java | 10 +- .../components/schemas/ComposedArray.java | 6 +- .../components/schemas/ComposedBool.java | 4 +- .../components/schemas/ComposedNone.java | 4 +- .../components/schemas/ComposedNumber.java | 4 +- .../components/schemas/ComposedObject.java | 4 +- .../schemas/ComposedOneOfDifferentTypes.java | 18 +- .../components/schemas/ComposedString.java | 4 +- .../components/schemas/Currency.java | 4 +- .../components/schemas/DanishPig.java | 12 +- .../components/schemas/DateTimeTest.java | 6 +- .../schemas/DateTimeWithValidations.java | 6 +- .../schemas/DateWithValidations.java | 6 +- .../components/schemas/Dog.java | 8 +- .../components/schemas/Drawing.java | 12 +- .../components/schemas/EnumArrays.java | 20 +- .../components/schemas/EnumClass.java | 4 +- .../components/schemas/EnumTest.java | 28 +- .../schemas/EquilateralTriangle.java | 12 +- .../components/schemas/File.java | 6 +- .../schemas/FileSchemaTestClass.java | 12 +- .../components/schemas/Foo.java | 6 +- .../components/schemas/FormatTest.java | 60 ++-- .../components/schemas/FromSchema.java | 6 +- .../components/schemas/Fruit.java | 4 +- .../components/schemas/FruitReq.java | 2 +- .../components/schemas/GmFruit.java | 4 +- .../components/schemas/GrandparentAnimal.java | 8 +- .../components/schemas/HasOnlyReadOnly.java | 6 +- .../components/schemas/HealthCheckResult.java | 10 +- .../components/schemas/IntegerEnum.java | 4 +- .../components/schemas/IntegerEnumBig.java | 4 +- .../schemas/IntegerEnumOneValue.java | 4 +- .../schemas/IntegerEnumWithDefaultValue.java | 4 +- .../components/schemas/IntegerMax10.java | 6 +- .../components/schemas/IntegerMin15.java | 6 +- .../components/schemas/IsoscelesTriangle.java | 12 +- .../components/schemas/Items.java | 6 +- .../components/schemas/JSONPatchRequest.java | 8 +- .../JSONPatchRequestAddReplaceTest.java | 12 +- .../schemas/JSONPatchRequestMoveCopy.java | 12 +- .../schemas/JSONPatchRequestRemove.java | 12 +- .../components/schemas/Mammal.java | 2 +- .../components/schemas/MapTest.java | 26 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 +- .../components/schemas/Money.java | 8 +- .../components/schemas/MyObjectDto.java | 6 +- .../components/schemas/Name.java | 6 +- .../schemas/NoAdditionalProperties.java | 8 +- .../components/schemas/NullableClass.java | 84 ++--- .../components/schemas/NullableShape.java | 2 +- .../components/schemas/NullableString.java | 4 +- .../components/schemas/NumberOnly.java | 6 +- .../schemas/NumberWithValidations.java | 4 +- .../schemas/ObjWithRequiredProps.java | 8 +- .../schemas/ObjWithRequiredPropsBase.java | 8 +- .../ObjectModelWithArgAndArgsProperties.java | 8 +- .../schemas/ObjectModelWithRefProps.java | 6 +- ...hAllOfWithReqTestPropFromUnsetAddProp.java | 10 +- .../ObjectWithCollidingProperties.java | 6 +- .../schemas/ObjectWithDecimalProperties.java | 6 +- .../ObjectWithDifficultlyNamedProps.java | 8 +- .../ObjectWithInlineCompositionProperty.java | 12 +- ...ObjectWithInvalidNamedRefedProperties.java | 8 +- .../ObjectWithNonIntersectingValues.java | 6 +- .../schemas/ObjectWithOnlyOptionalProps.java | 6 +- .../schemas/ObjectWithOptionalTestProp.java | 6 +- .../schemas/ObjectWithValidations.java | 4 +- .../components/schemas/Order.java | 10 +- .../schemas/PaginatedResultMyObjectDto.java | 14 +- .../components/schemas/ParentPet.java | 4 +- .../components/schemas/Pet.java | 24 +- .../components/schemas/Pig.java | 2 +- .../components/schemas/Player.java | 6 +- .../components/schemas/PublicKey.java | 6 +- .../components/schemas/Quadrilateral.java | 2 +- .../schemas/QuadrilateralInterface.java | 10 +- .../components/schemas/ReadOnlyFirst.java | 6 +- .../schemas/ReqPropsFromExplicitAddProps.java | 6 +- .../schemas/ReqPropsFromTrueAddProps.java | 6 +- .../schemas/ReqPropsFromUnsetAddProps.java | 6 +- .../components/schemas/ReturnSchema.java | 4 +- .../components/schemas/ScaleneTriangle.java | 12 +- .../components/schemas/Schema200Response.java | 4 +- .../schemas/SelfReferencingArrayModel.java | 6 +- .../schemas/SelfReferencingObjectModel.java | 6 +- .../components/schemas/Shape.java | 2 +- .../components/schemas/ShapeOrNull.java | 2 +- .../schemas/SimpleQuadrilateral.java | 12 +- .../components/schemas/SomeObject.java | 2 +- .../components/schemas/SpecialModelname.java | 6 +- .../components/schemas/StringBooleanMap.java | 4 +- .../components/schemas/StringEnum.java | 4 +- .../schemas/StringEnumWithDefaultValue.java | 4 +- .../schemas/StringWithValidation.java | 4 +- .../components/schemas/Tag.java | 6 +- .../components/schemas/Triangle.java | 2 +- .../components/schemas/TriangleInterface.java | 10 +- .../components/schemas/UUIDString.java | 6 +- .../components/schemas/User.java | 12 +- .../components/schemas/Whale.java | 12 +- .../components/schemas/Zebra.java | 16 +- .../delete/HeaderParameters.java | 6 +- .../delete/PathParameters.java | 8 +- .../delete/parameters/parameter1/Schema1.java | 4 +- .../commonparamsubdir/get/PathParameters.java | 8 +- .../get/QueryParameters.java | 6 +- .../parameter0/PathParamSchema0.java | 4 +- .../post/HeaderParameters.java | 6 +- .../post/PathParameters.java | 8 +- .../paths/fake/delete/HeaderParameters.java | 8 +- .../paths/fake/delete/QueryParameters.java | 8 +- .../delete/parameters/parameter1/Schema1.java | 4 +- .../delete/parameters/parameter4/Schema4.java | 4 +- .../paths/fake/get/HeaderParameters.java | 6 +- .../paths/fake/get/QueryParameters.java | 6 +- .../get/parameters/parameter0/Schema0.java | 10 +- .../get/parameters/parameter1/Schema1.java | 4 +- .../get/parameters/parameter2/Schema2.java | 10 +- .../get/parameters/parameter3/Schema3.java | 4 +- .../get/parameters/parameter4/Schema4.java | 6 +- .../get/parameters/parameter5/Schema5.java | 6 +- .../applicationxwwwformurlencoded/Schema.java | 20 +- .../applicationxwwwformurlencoded/Schema.java | 56 +-- .../put/QueryParameters.java | 8 +- .../put/QueryParameters.java | 8 +- .../delete/PathParameters.java | 8 +- .../content/applicationjson/Schema.java | 4 +- .../post/QueryParameters.java | 6 +- .../post/parameters/parameter0/Schema0.java | 6 +- .../post/parameters/parameter1/Schema1.java | 12 +- .../content/applicationjson/Schema.java | 6 +- .../content/multipartformdata/Schema.java | 12 +- .../content/applicationjson/Schema.java | 6 +- .../content/multipartformdata/Schema.java | 12 +- .../applicationxwwwformurlencoded/Schema.java | 8 +- .../content/applicationjson/Schema.java | 6 +- .../content/multipartformdata/Schema.java | 6 +- .../fakeobjinquery/get/QueryParameters.java | 6 +- .../get/parameters/parameter0/Schema0.java | 6 +- .../post/CookieParameters.java | 6 +- .../post/HeaderParameters.java | 6 +- .../post/PathParameters.java | 8 +- .../post/QueryParameters.java | 6 +- .../post/PathParameters.java | 8 +- .../content/multipartformdata/Schema.java | 10 +- .../get/QueryParameters.java | 8 +- .../get/QueryParameters.java | 6 +- .../put/QueryParameters.java | 8 +- .../put/parameters/parameter0/Schema0.java | 6 +- .../put/parameters/parameter1/Schema1.java | 6 +- .../put/parameters/parameter2/Schema2.java | 6 +- .../put/parameters/parameter3/Schema3.java | 6 +- .../put/parameters/parameter4/Schema4.java | 6 +- .../applicationoctetstream/Schema.java | 2 +- .../applicationoctetstream/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 10 +- .../content/multipartformdata/Schema.java | 14 +- .../content/applicationjson/Schema.java | 6 +- .../petfindbystatus/get/QueryParameters.java | 8 +- .../get/parameters/parameter0/Schema0.java | 10 +- .../petfindbytags/get/QueryParameters.java | 8 +- .../get/parameters/parameter0/Schema0.java | 6 +- .../petpetid/delete/HeaderParameters.java | 6 +- .../paths/petpetid/delete/PathParameters.java | 8 +- .../paths/petpetid/get/PathParameters.java | 8 +- .../paths/petpetid/post/PathParameters.java | 8 +- .../applicationxwwwformurlencoded/Schema.java | 6 +- .../post/PathParameters.java | 8 +- .../content/multipartformdata/Schema.java | 8 +- .../delete/PathParameters.java | 8 +- .../storeorderorderid/get/PathParameters.java | 8 +- .../get/parameters/parameter0/Schema0.java | 6 +- .../paths/userlogin/get/QueryParameters.java | 8 +- .../get/responses/response200/Headers.java | 8 +- .../userusername/delete/PathParameters.java | 8 +- .../userusername/get/PathParameters.java | 8 +- .../userusername/put/PathParameters.java | 8 +- .../schemas/AnyTypeJsonSchema.java | 2 +- .../schemas/BooleanJsonSchema.java | 4 +- .../schemas/DateJsonSchema.java | 4 +- .../schemas/DateTimeJsonSchema.java | 4 +- .../schemas/DecimalJsonSchema.java | 4 +- .../schemas/DoubleJsonSchema.java | 4 +- .../schemas/FloatJsonSchema.java | 4 +- .../schemas/Int32JsonSchema.java | 4 +- .../schemas/Int64JsonSchema.java | 4 +- .../schemas/IntJsonSchema.java | 4 +- .../schemas/JsonSchema.java | 31 +- .../schemas/JsonSchemas.java | 320 ------------------ .../schemas/ListJsonSchema.java | 4 +- .../schemas/MapJsonSchema.java | 4 +- .../schemas/NotAnyTypeJsonSchema.java | 2 +- .../schemas/NullJsonSchema.java | 4 +- .../schemas/NumberJsonSchema.java | 4 +- .../schemas/StringJsonSchema.java | 4 +- .../schemas/UnsetAnyTypeJsonSchema.java | 2 +- .../schemas/UuidJsonSchema.java | 6 +- .../AdditionalPropertiesValidator.java | 7 +- .../{ => validation}/CustomIsoparser.java | 2 +- .../schemas/validation/FakeValidator.java | 8 + .../FormatValidator.java | 9 +- .../ItemsValidator.java | 7 +- .../schemas/validation/KeywordValidator.java | 10 + .../{ => validation}/PathToSchemasMap.java | 2 +- .../PropertiesValidator.java | 7 +- .../RequiredValidator.java | 8 +- .../{ => validation}/SchemaValidator.java | 109 +----- .../TypeValidator.java | 8 +- .../{ => validation}/ValidationMetadata.java | 2 +- .../schemas/validators/FakeValidator.java | 12 - .../schemas/validators/KeywordValidator.java | 14 - .../schemas/ArrayTypeSchemaTest.java | 61 ++-- .../schemas/ObjectTypeSchemaTest.java | 109 +++--- .../AdditionalPropertiesValidatorTest.java | 5 +- .../{ => validation}/CustomIsoparserTest.java | 2 +- .../FormatValidatorTest.java | 5 +- .../ItemsValidatorTest.java | 5 +- .../PropertiesValidatorTest.java | 5 +- .../RequiredValidatorTest.java | 5 +- .../{ => validation}/SchemaValidatorTest.java | 4 +- .../TypeValidatorTest.java | 5 +- .../generators/JavaClientGenerator.java | 22 +- .../_Schema_anytypeOrMultitype.hbs | 2 +- .../schemas/SchemaClass/_Schema_boolean.hbs | 2 +- .../schemas/SchemaClass/_Schema_list.hbs | 2 +- .../schemas/SchemaClass/_Schema_map.hbs | 2 +- .../schemas/SchemaClass/_Schema_null.hbs | 2 +- .../schemas/SchemaClass/_Schema_number.hbs | 2 +- .../schemas/SchemaClass/_Schema_string.hbs | 2 +- .../SchemaClass/_Schema_varEqualsClass.hbs | 4 +- .../schemas/SchemaClass/_format.hbs | 2 +- .../components/schemas/SchemaClass/_items.hbs | 2 +- .../schemas/SchemaClass/_properties.hbs | 2 +- .../schemas/SchemaClass/_required.hbs | 2 +- .../components/schemas/SchemaClass/_types.hbs | 2 +- .../schemas/AnyTypeJsonSchema.hbs | 2 +- .../schemas/BooleanJsonSchema.hbs | 4 +- .../openapitools/schemas/DateJsonSchema.hbs | 4 +- .../schemas/DateTimeJsonSchema.hbs | 4 +- .../schemas/DecimalJsonSchema.hbs | 4 +- .../openapitools/schemas/DoubleJsonSchema.hbs | 4 +- .../openapitools/schemas/FloatJsonSchema.hbs | 4 +- .../openapitools/schemas/Int32JsonSchema.hbs | 4 +- .../openapitools/schemas/Int64JsonSchema.hbs | 4 +- .../openapitools/schemas/IntJsonSchema.hbs | 4 +- .../org/openapitools/schemas/JsonSchema.hbs | 31 +- .../openapitools/schemas/ListJsonSchema.hbs | 4 +- .../openapitools/schemas/MapJsonSchema.hbs | 4 +- .../schemas/NotAnyTypeJsonSchema.hbs | 2 +- .../openapitools/schemas/NullJsonSchema.hbs | 4 +- .../openapitools/schemas/NumberJsonSchema.hbs | 4 +- .../openapitools/schemas/StringJsonSchema.hbs | 4 +- .../schemas/UnsetAnyTypeJsonSchema.hbs | 2 +- .../openapitools/schemas/UuidJsonSchema.hbs | 6 +- .../AdditionalPropertiesValidator.hbs | 7 +- .../{ => validation}/CustomIsoparser.hbs | 2 +- .../schemas/validation/FakeValidator.hbs | 8 + .../FormatValidator.hbs | 9 +- .../ItemsValidator.hbs | 7 +- .../schemas/validation/KeywordValidator.hbs | 10 + .../{ => validation}/PathToSchemasMap.hbs | 2 +- .../PropertiesValidator.hbs | 7 +- .../RequiredValidator.hbs | 8 +- .../{ => validation}/SchemaValidator.hbs | 111 +----- .../TypeValidator.hbs | 8 +- .../{ => validation}/ValidationMetadata.hbs | 2 +- .../schemas/validators/FakeValidator.hbs | 12 - .../schemas/validators/KeywordValidator.hbs | 14 - .../schemas/ArrayTypeSchemaTest.hbs | 61 ++-- .../schemas/ObjectTypeSchemaTest.hbs | 109 +++--- .../AdditionalPropertiesValidatorTest.hbs | 5 +- .../{ => validation}/CustomIsoparserTest.hbs | 2 +- .../FormatValidatorTest.hbs | 5 +- .../ItemsValidatorTest.hbs | 5 +- .../PropertiesValidatorTest.hbs | 5 +- .../RequiredValidatorTest.hbs | 5 +- .../{ => validation}/SchemaValidatorTest.hbs | 4 +- .../TypeValidatorTest.hbs | 5 +- 317 files changed, 1360 insertions(+), 1950 deletions(-) delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchemas.java rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{validators => validation}/AdditionalPropertiesValidator.java (83%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/CustomIsoparser.java (84%) create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{validators => validation}/FormatValidator.java (93%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{validators => validation}/ItemsValidator.java (78%) create mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/PathToSchemasMap.java (92%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{validators => validation}/PropertiesValidator.java (81%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{validators => validation}/RequiredValidator.java (72%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/SchemaValidator.java (50%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{validators => validation}/TypeValidator.java (54%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/ValidationMetadata.java (92%) delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/FakeValidator.java delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/KeywordValidator.java rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{validators => validation}/AdditionalPropertiesValidatorTest.java (94%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{ => validation}/CustomIsoparserTest.java (93%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{validators => validation}/FormatValidatorTest.java (97%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{validators => validation}/ItemsValidatorTest.java (93%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{validators => validation}/PropertiesValidatorTest.java (94%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{validators => validation}/RequiredValidatorTest.java (93%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{ => validation}/SchemaValidatorTest.java (93%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/{validators => validation}/TypeValidatorTest.java (88%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{validators => validation}/AdditionalPropertiesValidator.hbs (84%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/CustomIsoparser.hbs (87%) create mode 100644 src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs rename src/main/resources/java/src/main/java/org/openapitools/schemas/{validators => validation}/FormatValidator.hbs (94%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{validators => validation}/ItemsValidator.hbs (80%) create mode 100644 src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/PathToSchemasMap.hbs (93%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{validators => validation}/PropertiesValidator.hbs (82%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{validators => validation}/RequiredValidator.hbs (72%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/SchemaValidator.hbs (50%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{validators => validation}/TypeValidator.hbs (56%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/ValidationMetadata.hbs (93%) delete mode 100644 src/main/resources/java/src/main/java/org/openapitools/schemas/validators/FakeValidator.hbs delete mode 100644 src/main/resources/java/src/main/java/org/openapitools/schemas/validators/KeywordValidator.hbs rename src/main/resources/java/src/test/java/org/openapitools/schemas/{validators => validation}/AdditionalPropertiesValidatorTest.hbs (95%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/{ => validation}/CustomIsoparserTest.hbs (94%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/{validators => validation}/FormatValidatorTest.hbs (98%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/{validators => validation}/ItemsValidatorTest.hbs (94%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/{validators => validation}/PropertiesValidatorTest.hbs (95%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/{validators => validation}/RequiredValidatorTest.hbs (94%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/{ => validation}/SchemaValidatorTest.hbs (94%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/{validators => validation}/TypeValidatorTest.hbs (89%) diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index af964663817..456bbca45a0 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -343,7 +343,6 @@ src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.j src/main/java/org/openapijsonschematools/paths/userusername/put/requestbody/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/schemas/AnyTypeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java -src/main/java/org/openapijsonschematools/schemas/CustomIsoparser.java src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java @@ -360,36 +359,37 @@ src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java -src/main/java/org/openapijsonschematools/schemas/PathToSchemasMap.java src/main/java/org/openapijsonschematools/schemas/PathToTypeMap.java -src/main/java/org/openapijsonschematools/schemas/SchemaValidator.java src/main/java/org/openapijsonschematools/schemas/StringJsonSchema.java src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java -src/main/java/org/openapijsonschematools/schemas/ValidationMetadata.java -src/main/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidator.java -src/main/java/org/openapijsonschematools/schemas/validators/FakeValidator.java -src/main/java/org/openapijsonschematools/schemas/validators/FormatValidator.java -src/main/java/org/openapijsonschematools/schemas/validators/ItemsValidator.java -src/main/java/org/openapijsonschematools/schemas/validators/KeywordValidator.java -src/main/java/org/openapijsonschematools/schemas/validators/PropertiesValidator.java -src/main/java/org/openapijsonschematools/schemas/validators/RequiredValidator.java -src/main/java/org/openapijsonschematools/schemas/validators/TypeValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/CustomIsoparser.java +src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java +src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java src/test/java/org/openapijsonschematools/configurations/JsonSchemaKeywordFlagsTest.java src/test/java/org/openapijsonschematools/schemas/AnyTypeSchemaTest.java src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java src/test/java/org/openapijsonschematools/schemas/BooleanSchemaTest.java -src/test/java/org/openapijsonschematools/schemas/CustomIsoparserTest.java src/test/java/org/openapijsonschematools/schemas/ListSchemaTest.java src/test/java/org/openapijsonschematools/schemas/MapSchemaTest.java src/test/java/org/openapijsonschematools/schemas/NullSchemaTest.java src/test/java/org/openapijsonschematools/schemas/NumberSchemaTest.java src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java src/test/java/org/openapijsonschematools/schemas/RefBooleanSchemaTest.java -src/test/java/org/openapijsonschematools/schemas/SchemaValidatorTest.java -src/test/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidatorTest.java -src/test/java/org/openapijsonschematools/schemas/validators/FormatValidatorTest.java -src/test/java/org/openapijsonschematools/schemas/validators/ItemsValidatorTest.java -src/test/java/org/openapijsonschematools/schemas/validators/PropertiesValidatorTest.java -src/test/java/org/openapijsonschematools/schemas/validators/RequiredValidatorTest.java -src/test/java/org/openapijsonschematools/schemas/validators/TypeValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/CustomIsoparserTest.java +src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java 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 296d8e74d83..f4f03404491 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 @@ -17,11 +17,11 @@ public static class SchemaTuple extends FrozenList { } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = User.User1.class; + public static final Class items = User.User1.class; protected static SchemaTuple getListOutputInstance(FrozenList arg) { return new SchemaTuple(arg); } 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 964ee9fce6b..5cc9ea1b5af 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 @@ -28,11 +28,11 @@ public static HeadersMap of(Map arg, SchemaConfiguration configu } } - public class Headers1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Headers1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("location", LocationSchema.LocationSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 18cbf4e018b..2b7b8fe9f58 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 @@ -18,11 +18,11 @@ public static class SchemaTuple extends FrozenList { } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = RefPet.RefPet1.class; + public static final Class items = RefPet.RefPet1.class; protected static SchemaTuple getListOutputInstance(FrozenList arg) { return new SchemaTuple(arg); } 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 1c45392c242..83dbaba177b 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 @@ -17,11 +17,11 @@ public static class SchemaTuple extends FrozenList { } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Pet.Pet1.class; + public static final Class items = Pet.Pet1.class; protected static SchemaTuple getListOutputInstance(FrozenList arg) { return new SchemaTuple(arg); } 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 051b8b011fd..598e8451cfe 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 @@ -28,11 +28,11 @@ public static HeadersMap of(Map arg, SchemaConfiguration configu } } - public class Headers1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Headers1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someHeader", SomeHeaderSchema.SomeHeaderSchema1.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 1bb4a9d0556..1560d1ea338 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 @@ -23,8 +23,8 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; 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 160fbf64334..63324240bdc 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 @@ -31,18 +31,18 @@ public static HeadersMap of(Map arg, SchemaConfiguration configu } } - public class Headers1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Headers1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ref-schema-header", StringWithValidation.StringWithValidation1.class), new AbstractMap.SimpleEntry>("int32", Int32JsonContentTypeHeaderSchema.Int32JsonContentTypeHeaderSchema1.class), new AbstractMap.SimpleEntry>("ref-content-schema-header", StringWithValidation.StringWithValidation1.class), new AbstractMap.SimpleEntry>("stringHeader", StringHeaderSchema.StringHeaderSchema1.class), new AbstractMap.SimpleEntry>("numberHeader", NumberHeaderSchema.NumberHeaderSchema1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "int32", "ref-content-schema-header", "ref-schema-header", 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 e542ce92674..cf38368fa7a 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 @@ -25,7 +25,7 @@ public static AbstractStepMessageMap of(Map arg, SchemaConfigura } } - public class AbstractStepMessage1 implements JsonSchema { + public class AbstractStepMessage1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -34,13 +34,13 @@ public class AbstractStepMessage1 implements JsonSchema { Abstract Step */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("discriminator", Discriminator.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "description", "discriminator", "sequenceNumber" 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 ed4a54f7008..68bcf84cfec 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 @@ -28,8 +28,8 @@ public static MapPropertyMap of(Map arg, SchemaConfiguration con } } - public class MapProperty implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class MapProperty extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; @@ -54,8 +54,8 @@ public static AdditionalPropertiesMap of(Map arg, SchemaConfigur } } - public class AdditionalProperties1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class AdditionalProperties1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; @@ -77,8 +77,8 @@ public static MapOfMapPropertyMap of(Map arg, SchemaConfiguratio } } - public class MapOfMapProperty implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class MapOfMapProperty extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; @@ -112,8 +112,8 @@ public static MapWithUndeclaredPropertiesAnytype3Map of(Map arg, } } - public class MapWithUndeclaredPropertiesAnytype3 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class MapWithUndeclaredPropertiesAnytype3 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; @@ -140,8 +140,8 @@ public static EmptyMapMap of(Map arg, SchemaConfiguration config } } - public class EmptyMap implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class EmptyMap extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties4.class; @@ -166,8 +166,8 @@ public static MapWithUndeclaredPropertiesStringMap of(Map arg, S } } - public class MapWithUndeclaredPropertiesString implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class MapWithUndeclaredPropertiesString extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties5.class; @@ -189,17 +189,17 @@ public static AdditionalPropertiesClassMap of(Map arg, SchemaCon } } - public class AdditionalPropertiesClass1 implements JsonSchema { + public class AdditionalPropertiesClass1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("map_property", MapProperty.class), new AbstractMap.SimpleEntry>("map_of_map_property", MapOfMapProperty.class), new AbstractMap.SimpleEntry>("anytype_1", Anytype1.class), 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 28623016919..cd79d933ea7 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 @@ -28,8 +28,8 @@ public static Schema0Map of(Map arg, SchemaConfiguration configu } } - public class Schema0 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; @@ -42,7 +42,7 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalProperties1 implements JsonSchema { + public class AdditionalProperties1 extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties1.class, arg, configuration); } @@ -101,8 +101,8 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; @@ -115,7 +115,7 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalProperties2 implements JsonSchema { + public class AdditionalProperties2 extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties2.class, arg, configuration); } @@ -174,8 +174,8 @@ public static Schema2Map of(Map arg, SchemaConfiguration configu } } - public class Schema2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema2 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; @@ -188,14 +188,14 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalPropertiesValidator1 implements JsonSchema { + public class AdditionalPropertiesValidator1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); public static T validate(Map arg, SchemaConfiguration 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 669a05a0d22..c5cbadf5806 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 @@ -18,11 +18,11 @@ public static class AdditionalPropertiesTuple extends FrozenList { } } - public class AdditionalProperties implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class AdditionalProperties extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = EnumClass.EnumClass1.class; + public static final Class items = EnumClass.EnumClass1.class; protected static AdditionalPropertiesTuple getListOutputInstance(FrozenList arg) { return new AdditionalPropertiesTuple(arg); } @@ -40,14 +40,14 @@ public static AdditionalPropertiesWithArrayOfEnumsMap of(Map arg } } - public class AdditionalPropertiesWithArrayOfEnums1 implements JsonSchema { + public class AdditionalPropertiesWithArrayOfEnums1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; 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 312c6f6eea2..606ead4d65c 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 @@ -23,14 +23,14 @@ public static AddressMap of(Map arg, SchemaConfiguration configu } } - public class Address1 implements JsonSchema { + public class Address1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; 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 7316c0c1708..768940c6b22 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 @@ -16,8 +16,8 @@ public class Animal { public class ClassName extends StringJsonSchema {} - public class Color implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Color extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -34,21 +34,21 @@ public static AnimalMap of(Map arg, SchemaConfiguration configur } } - public class Animal1 implements JsonSchema { + public class Animal1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("className", ClassName.class), new AbstractMap.SimpleEntry>("color", Color.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "className" )); protected static AnimalMap getMapOutputInstance(FrozenMap arg) { 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 f1d3bc348f5..a1f53216378 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 @@ -16,17 +16,17 @@ public static class AnimalFarmTuple extends FrozenList { } } - public class AnimalFarm1 implements JsonSchema { + public class AnimalFarm1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Animal.Animal1.class; + public static final Class items = Animal.Animal1.class; protected static AnimalFarmTuple getListOutputInstance(FrozenList arg) { return new AnimalFarmTuple(arg); } 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 e62e5f91f85..cd495964ea8 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 @@ -17,8 +17,8 @@ public class AnyTypeAndFormat { // nest classes so all schemas and input/output classes can be public - public class UuidSchema implements JsonSchema { - static final String format = "uuid"; + public class UuidSchema extends JsonSchema { + public static final String format = "uuid"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(UuidSchema.class, arg, configuration); } @@ -68,8 +68,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Date implements JsonSchema { - static final String format = "date"; + public class Date extends JsonSchema { + public static final String format = "date"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Date.class, arg, configuration); } @@ -119,8 +119,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Datetime implements JsonSchema { - static final String format = "date-time"; + public class Datetime extends JsonSchema { + public static final String format = "date-time"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Datetime.class, arg, configuration); } @@ -170,8 +170,8 @@ public static U validate(List arg, SchemaConfigur } } - public class NumberSchema implements JsonSchema { - static final String format = "number"; + public class NumberSchema extends JsonSchema { + public static final String format = "number"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(NumberSchema.class, arg, configuration); } @@ -221,8 +221,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Binary implements JsonSchema { - static final String format = "binary"; + public class Binary extends JsonSchema { + public static final String format = "binary"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Binary.class, arg, configuration); } @@ -272,8 +272,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Int32 implements JsonSchema { - static final String format = "int32"; + public class Int32 extends JsonSchema { + public static final String format = "int32"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Int32.class, arg, configuration); } @@ -323,8 +323,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Int64 implements JsonSchema { - static final String format = "int64"; + public class Int64 extends JsonSchema { + public static final String format = "int64"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Int64.class, arg, configuration); } @@ -374,8 +374,8 @@ public static U validate(List arg, SchemaConfigur } } - public class DoubleSchema implements JsonSchema { - static final String format = "double"; + public class DoubleSchema extends JsonSchema { + public static final String format = "double"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(DoubleSchema.class, arg, configuration); } @@ -425,8 +425,8 @@ public static U validate(List arg, SchemaConfigur } } - public class FloatSchema implements JsonSchema { - static final String format = "float"; + public class FloatSchema extends JsonSchema { + public static final String format = "float"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(FloatSchema.class, arg, configuration); } @@ -485,17 +485,17 @@ public static AnyTypeAndFormatMap of(Map arg, SchemaConfiguratio } } - public class AnyTypeAndFormat1 implements JsonSchema { + public class AnyTypeAndFormat1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("uuid", UuidSchema.class), new AbstractMap.SimpleEntry>("date", Date.class), new AbstractMap.SimpleEntry>("date-time", Datetime.class), 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 8493d596284..a596221f1c6 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 @@ -17,7 +17,7 @@ public class AnyTypeNotString { public class Not extends StringJsonSchema {} - public class AnyTypeNotString1 implements JsonSchema { + public class AnyTypeNotString1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 569fcfb9bf1..6a4a4064c71 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 @@ -32,17 +32,17 @@ public static ApiResponseMap of(Map arg, SchemaConfiguration con } } - public class ApiResponseSchema1 implements JsonSchema { + public class ApiResponseSchema1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("code", Code.class), new AbstractMap.SimpleEntry>("type", Type.class), new AbstractMap.SimpleEntry>("message", Message.class) 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 5889bf7fef0..1c6625ab117 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 @@ -12,8 +12,8 @@ public class Apple { // nest classes so all schemas and input/output classes can be public - public class Cultivar implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Cultivar extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -21,8 +21,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Origin implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Origin extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -39,22 +39,22 @@ public static AppleMap of(Map arg, SchemaConfiguration configura } } - public class Apple1 implements JsonSchema { + public class Apple1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("cultivar", Cultivar.class), new AbstractMap.SimpleEntry>("origin", Origin.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "cultivar" )); public static Void validate(Void 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 fb102024fea..ed45b488969 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 @@ -35,21 +35,21 @@ public static AppleReqMap of(Map arg, SchemaConfiguration config } } - public class AppleReq1 implements JsonSchema { + public class AppleReq1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("cultivar", Cultivar.class), new AbstractMap.SimpleEntry>("mealy", Mealy.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "cultivar" )); static final Class additionalProperties = AdditionalProperties.class; 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 3031e7e580b..89783717afc 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 @@ -20,17 +20,17 @@ public static class ArrayHoldingAnyTypeTuple extends FrozenList { } } - public class ArrayHoldingAnyType1 implements JsonSchema { + public class ArrayHoldingAnyType1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ArrayHoldingAnyTypeTuple getListOutputInstance(FrozenList arg) { return new ArrayHoldingAnyTypeTuple(arg); } 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 0f78b759bd8..06da9e93944 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 @@ -24,11 +24,11 @@ public static class ItemsTuple extends FrozenList { } } - public class Items implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Items extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items1.class; + public static final Class items = Items1.class; protected static ItemsTuple getListOutputInstance(FrozenList arg) { return new ItemsTuple(arg); } @@ -43,11 +43,11 @@ public static class ArrayArrayNumberTuple extends FrozenList { } } - public class ArrayArrayNumber implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayArrayNumber extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ArrayArrayNumberTuple getListOutputInstance(FrozenList arg) { return new ArrayArrayNumberTuple(arg); } @@ -65,17 +65,17 @@ public static ArrayOfArrayOfNumberOnlyMap of(Map arg, SchemaConf } } - public class ArrayOfArrayOfNumberOnly1 implements JsonSchema { + public class ArrayOfArrayOfNumberOnly1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayArrayNumber", ArrayArrayNumber.class) )); protected static ArrayOfArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { 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 9f413427fae..306e77f1a48 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 @@ -16,17 +16,17 @@ public static class ArrayOfEnumsTuple extends FrozenList { } } - public class ArrayOfEnums1 implements JsonSchema { + public class ArrayOfEnums1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = StringEnum.StringEnum1.class; + public static final Class items = StringEnum.StringEnum1.class; protected static ArrayOfEnumsTuple getListOutputInstance(FrozenList arg) { return new ArrayOfEnumsTuple(arg); } 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 ad4ece8ad58..ea1104cb08b 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 @@ -24,11 +24,11 @@ public static class ArrayNumberTuple extends FrozenList { } } - public class ArrayNumber implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayNumber extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ArrayNumberTuple getListOutputInstance(FrozenList arg) { return new ArrayNumberTuple(arg); } @@ -46,17 +46,17 @@ public static ArrayOfNumberOnlyMap of(Map arg, SchemaConfigurati } } - public class ArrayOfNumberOnly1 implements JsonSchema { + public class ArrayOfNumberOnly1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("ArrayNumber", ArrayNumber.class) )); protected static ArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { 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 fa48d2f5678..ea6ae213006 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 @@ -25,11 +25,11 @@ public static class ArrayOfStringTuple extends FrozenList { } } - public class ArrayOfString implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayOfString extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ArrayOfStringTuple getListOutputInstance(FrozenList arg) { return new ArrayOfStringTuple(arg); } @@ -47,11 +47,11 @@ public static class ItemsTuple extends FrozenList { } } - public class Items1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Items1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items2.class; + public static final Class items = Items2.class; protected static ItemsTuple getListOutputInstance(FrozenList arg) { return new ItemsTuple(arg); } @@ -66,11 +66,11 @@ public static class ArrayArrayOfIntegerTuple extends FrozenList { } } - public class ArrayArrayOfInteger implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayArrayOfInteger extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items1.class; + public static final Class items = Items1.class; protected static ArrayArrayOfIntegerTuple getListOutputInstance(FrozenList arg) { return new ArrayArrayOfIntegerTuple(arg); } @@ -85,11 +85,11 @@ public static class ItemsTuple1 extends FrozenList { } } - public class Items3 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Items3 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = ReadOnlyFirst.ReadOnlyFirst1.class; + public static final Class items = ReadOnlyFirst.ReadOnlyFirst1.class; protected static ItemsTuple1 getListOutputInstance(FrozenList arg) { return new ItemsTuple1(arg); } @@ -104,11 +104,11 @@ public static class ArrayArrayOfModelTuple extends FrozenList { } } - public class ArrayArrayOfModel implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayArrayOfModel extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items3.class; + public static final Class items = Items3.class; protected static ArrayArrayOfModelTuple getListOutputInstance(FrozenList arg) { return new ArrayArrayOfModelTuple(arg); } @@ -126,17 +126,17 @@ public static ArrayTestMap of(Map arg, SchemaConfiguration confi } } - public class ArrayTest1 implements JsonSchema { + public class ArrayTest1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("array_of_string", ArrayOfString.class), new AbstractMap.SimpleEntry>("array_array_of_integer", ArrayArrayOfInteger.class), new AbstractMap.SimpleEntry>("array_array_of_model", ArrayArrayOfModel.class) 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 f5ee0706fc5..49136258a56 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 @@ -10,14 +10,14 @@ public class ArrayWithValidationsInItems { // 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( + public class Items extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int64"; + public static final String format = "int64"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items.class, Long.valueOf(arg), configuration); } @@ -41,17 +41,17 @@ public static class ArrayWithValidationsInItemsTuple extends FrozenList } } - public class ArrayWithValidationsInItems1 implements JsonSchema { + public class ArrayWithValidationsInItems1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ArrayWithValidationsInItemsTuple getListOutputInstance(FrozenList arg) { return new ArrayWithValidationsInItemsTuple(arg); } 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 51ab1c6cedd..7b289bf31e0 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 @@ -25,20 +25,20 @@ public static BananaMap of(Map arg, SchemaConfiguration configur } } - public class Banana1 implements JsonSchema { + public class Banana1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("lengthCm", LengthCm.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "lengthCm" )); protected static BananaMap getMapOutputInstance(FrozenMap arg) { 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 b3e086d0435..84628e9661c 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 @@ -35,21 +35,21 @@ public static BananaReqMap of(Map arg, SchemaConfiguration confi } } - public class BananaReq1 implements JsonSchema { + public class BananaReq1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("lengthCm", LengthCm.class), new AbstractMap.SimpleEntry>("sweet", Sweet.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "lengthCm" )); static final Class additionalProperties = AdditionalProperties.class; 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 96475e04d91..f30aa195bd1 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 @@ -8,14 +8,14 @@ public class Bar { // nest classes so all schemas and input/output classes can be public - public class Bar1 implements JsonSchema { + public class Bar1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 02ef4d4f776..2b54aa8e2d9 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 @@ -12,8 +12,8 @@ public class BasquePig { // 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( + public class ClassName extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -30,20 +30,20 @@ public static BasquePigMap of(Map arg, SchemaConfiguration confi } } - public class BasquePig1 implements JsonSchema { + public class BasquePig1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("className", ClassName.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "className" )); protected static BasquePigMap getMapOutputInstance(FrozenMap arg) { 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 00dcff338fb..aaba343af70 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 @@ -8,14 +8,14 @@ public class BooleanEnum { // nest classes so all schemas and input/output classes can be public - public class BooleanEnum1 implements JsonSchema { + public class BooleanEnum1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Boolean.class )); public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { 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 b3768d28995..05bdefddd9b 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 @@ -40,17 +40,17 @@ public static CapitalizationMap of(Map arg, SchemaConfiguration } } - public class Capitalization1 implements JsonSchema { + public class Capitalization1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("smallCamel", SmallCamel.class), new AbstractMap.SimpleEntry>("CapitalCamel", CapitalCamel.class), new AbstractMap.SimpleEntry>("small_Snake", SmallSnake.class), 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 48d11b237a4..b9c1352b6c7 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 @@ -30,11 +30,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("declawed", Declawed.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -46,7 +46,7 @@ public static T validate(Map arg, SchemaCo } - public class Cat1 implements JsonSchema { + public class Cat1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 531f0c2ab16..f7c37d7405f 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 @@ -16,8 +16,8 @@ public class Category { public class Id extends Int64JsonSchema {} - public class Name implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Name extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -34,21 +34,21 @@ public static CategoryMap of(Map arg, SchemaConfiguration config } } - public class Category1 implements JsonSchema { + public class Category1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("name", Name.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "name" )); protected static CategoryMap getMapOutputInstance(FrozenMap arg) { 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 c128c248f9e..eb577b85bbd 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 @@ -30,11 +30,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -46,7 +46,7 @@ public static T validate(Map arg, SchemaCo } - public class ChildCat1 implements JsonSchema { + public class ChildCat1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 6385bedf9db..6f1f51483b2 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 @@ -28,7 +28,7 @@ public static ClassModelMap of(Map arg, SchemaConfiguration conf } } - public class ClassModel1 implements JsonSchema { + public class ClassModel1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -37,7 +37,7 @@ public class ClassModel1 implements JsonSchema { Model for testing model with "_class" property */ - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("_class", ClassSchema.class) )); public static Void validate(Void arg, SchemaConfiguration 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 242a8a3f3ca..fc35172eb28 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 @@ -25,17 +25,17 @@ public static ClientMap of(Map arg, SchemaConfiguration configur } } - public class Client1 implements JsonSchema { + public class Client1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("client", Client2.class) )); protected static ClientMap getMapOutputInstance(FrozenMap arg) { 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 e3b683473e8..7597ffdec1f 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 @@ -17,8 +17,8 @@ public class ComplexQuadrilateral { // nest classes so all schemas and input/output classes can be public - public class QuadrilateralType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QuadrilateralType extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -35,11 +35,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -51,7 +51,7 @@ public static T validate(Map arg, SchemaCo } - public class ComplexQuadrilateral1 implements JsonSchema { + public class ComplexQuadrilateral1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 69d00761b89..49e77cb1e69 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 @@ -37,7 +37,7 @@ public class Schema1 extends DateJsonSchema {} public class Schema2 extends DateTimeJsonSchema {} - public class Schema3 implements JsonSchema { + public class Schema3 extends JsonSchema { // BinarySchema } @@ -66,11 +66,11 @@ public static class Schema9Tuple extends FrozenList { } } - public class Schema9 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema9 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static Schema9Tuple getListOutputInstance(FrozenList arg) { return new Schema9Tuple(arg); } @@ -97,7 +97,7 @@ public class Schema14 extends Int32JsonSchema {} public class Schema15 extends Int64JsonSchema {} - public class ComposedAnyOfDifferentTypesNoValidations1 implements JsonSchema { + public class ComposedAnyOfDifferentTypesNoValidations1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 b1fe7e2518c..f244d278845 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 @@ -20,17 +20,17 @@ public static class ComposedArrayTuple extends FrozenList { } } - public class ComposedArray1 implements JsonSchema { + public class ComposedArray1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ComposedArrayTuple getListOutputInstance(FrozenList arg) { return new ComposedArrayTuple(arg); } 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 99ccf357c0f..6fbce3758d5 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 @@ -12,14 +12,14 @@ public class ComposedBool { public class Schema0 extends AnyTypeJsonSchema {} - public class ComposedBool1 implements JsonSchema { + public class ComposedBool1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Boolean.class )); public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { 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 6fc17f12d1c..9b88fb3dbb0 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 @@ -12,14 +12,14 @@ public class ComposedNone { public class Schema0 extends AnyTypeJsonSchema {} - public class ComposedNone1 implements JsonSchema { + public class ComposedNone1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class )); public static Void validate(Void arg, SchemaConfiguration configuration) { 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 04821c3a958..990e265a14f 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 @@ -12,14 +12,14 @@ public class ComposedNumber { public class Schema0 extends AnyTypeJsonSchema {} - public class ComposedNumber1 implements JsonSchema { + public class ComposedNumber1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 e5c49f7af62..18183315461 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 @@ -14,14 +14,14 @@ public class ComposedObject { public class Schema0 extends AnyTypeJsonSchema {} - public class ComposedObject1 implements JsonSchema { + public class ComposedObject1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); public static T validate(Map arg, SchemaConfiguration configuration) { 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 8f269073d73..ec8018174b9 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 @@ -24,8 +24,8 @@ public class Schema2 extends NullJsonSchema {} public class Schema3 extends DateJsonSchema {} - public class Schema4 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema4 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); public static T validate(Map arg, SchemaConfiguration configuration) { @@ -43,11 +43,11 @@ public static class Schema5Tuple extends FrozenList { } } - public class Schema5 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema5 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static Schema5Tuple getListOutputInstance(FrozenList arg) { return new Schema5Tuple(arg); } @@ -56,17 +56,17 @@ public static U validate(List arg, SchemaConfigur } } - public class Schema6 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema6 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "date-time"; + public static final String format = "date-time"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema6.class, arg, configuration); } } - public class ComposedOneOfDifferentTypes1 implements JsonSchema { + public class ComposedOneOfDifferentTypes1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 697227e728c..c323a5066bd 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 @@ -12,14 +12,14 @@ public class ComposedString { public class Schema0 extends AnyTypeJsonSchema {} - public class ComposedString1 implements JsonSchema { + public class ComposedString1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 534e6ea6454..a63b3898f26 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 @@ -8,14 +8,14 @@ public class Currency { // nest classes so all schemas and input/output classes can be public - public class Currency1 implements JsonSchema { + public class Currency1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 3ec6cd6f68b..41ca587c4d1 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 @@ -12,8 +12,8 @@ public class DanishPig { // 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( + public class ClassName extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -30,20 +30,20 @@ public static DanishPigMap of(Map arg, SchemaConfiguration confi } } - public class DanishPig1 implements JsonSchema { + public class DanishPig1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("className", ClassName.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "className" )); protected static DanishPigMap getMapOutputInstance(FrozenMap arg) { 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 4c3045af39e..a3034de7466 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 @@ -9,17 +9,17 @@ public class DateTimeTest { // nest classes so all schemas and input/output classes can be public - public class DateTimeTest1 implements JsonSchema { + public class DateTimeTest1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "date-time"; + public static final String format = "date-time"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(DateTimeTest1.class, arg, configuration); } 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 bbb9e784f3b..9114b368858 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 @@ -9,17 +9,17 @@ public class DateTimeWithValidations { // nest classes so all schemas and input/output classes can be public - public class DateTimeWithValidations1 implements JsonSchema { + public class DateTimeWithValidations1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "date-time"; + public static final String format = "date-time"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(DateTimeWithValidations1.class, arg, configuration); } 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 c8495a68938..eb66076dd85 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 @@ -9,17 +9,17 @@ public class DateWithValidations { // nest classes so all schemas and input/output classes can be public - public class DateWithValidations1 implements JsonSchema { + public class DateWithValidations1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "date"; + public static final String format = "date"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(DateWithValidations1.class, arg, configuration); } 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 eaec8077e97..03e00aad1f3 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 @@ -30,11 +30,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("breed", Breed.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -46,7 +46,7 @@ public static T validate(Map arg, SchemaCo } - public class Dog1 implements JsonSchema { + public class Dog1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 8cd68165b89..bc8b9d03396 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 @@ -20,11 +20,11 @@ public static class ShapesTuple extends FrozenList { } } - public class Shapes implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Shapes extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Shape.Shape1.class; + public static final Class items = Shape.Shape1.class; protected static ShapesTuple getListOutputInstance(FrozenList arg) { return new ShapesTuple(arg); } @@ -42,17 +42,17 @@ public static DrawingMap of(Map arg, SchemaConfiguration configu } } - public class Drawing1 implements JsonSchema { + public class Drawing1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("mainShape", Shape.Shape1.class), new AbstractMap.SimpleEntry>("shapeOrNull", ShapeOrNull.ShapeOrNull1.class), new AbstractMap.SimpleEntry>("nullableShape", NullableShape.NullableShape1.class), 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 d00266bbb6d..218ab40d9f9 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 @@ -14,8 +14,8 @@ public class EnumArrays { // nest classes so all schemas and input/output classes can be public - public class JustSymbol implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class JustSymbol extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -23,8 +23,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Items implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Items extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -38,11 +38,11 @@ public static class ArrayEnumTuple extends FrozenList { } } - public class ArrayEnum implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayEnum extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ArrayEnumTuple getListOutputInstance(FrozenList arg) { return new ArrayEnumTuple(arg); } @@ -60,17 +60,17 @@ public static EnumArraysMap of(Map arg, SchemaConfiguration conf } } - public class EnumArrays1 implements JsonSchema { + public class EnumArrays1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("just_symbol", JustSymbol.class), new AbstractMap.SimpleEntry>("array_enum", ArrayEnum.class) )); 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 ada2b9d4825..c9d3d860d98 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 @@ -8,14 +8,14 @@ public class EnumClass { // nest classes so all schemas and input/output classes can be public - public class EnumClass1 implements JsonSchema { + public class EnumClass1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 a3d13f1358c..6a126c8ec2e 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 @@ -12,8 +12,8 @@ public class EnumTest { // nest classes so all schemas and input/output classes can be public - public class EnumString implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class EnumString extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -21,8 +21,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class EnumStringRequired implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class EnumStringRequired extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -30,14 +30,14 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class EnumInteger implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class EnumInteger extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int32"; + public static final String format = "int32"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(EnumInteger.class, Long.valueOf(arg), configuration); } @@ -55,14 +55,14 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } - public class EnumNumber implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class EnumNumber extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "double"; + public static final String format = "double"; public static Double validate(Double arg, SchemaConfiguration configuration) { return JsonSchema.validate(EnumNumber.class, arg, configuration); } @@ -77,17 +77,17 @@ public static EnumTestMap of(Map arg, SchemaConfiguration config } } - public class EnumTest1 implements JsonSchema { + public class EnumTest1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("enum_string", EnumString.class), new AbstractMap.SimpleEntry>("enum_string_required", EnumStringRequired.class), new AbstractMap.SimpleEntry>("enum_integer", EnumInteger.class), @@ -98,7 +98,7 @@ public class EnumTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("IntegerEnumWithDefaultValue", IntegerEnumWithDefaultValue.IntegerEnumWithDefaultValue1.class), new AbstractMap.SimpleEntry>("IntegerEnumOneValue", IntegerEnumOneValue.IntegerEnumOneValue1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "enum_string_required" )); protected static EnumTestMap getMapOutputInstance(FrozenMap arg) { 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 7ebfe3de459..120a701b843 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 @@ -17,8 +17,8 @@ public class EquilateralTriangle { // nest classes so all schemas and input/output classes can be public - public class TriangleType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class TriangleType extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -35,11 +35,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -51,7 +51,7 @@ public static T validate(Map arg, SchemaCo } - public class EquilateralTriangle1 implements JsonSchema { + public class EquilateralTriangle1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 fdaba31023e..5fb95322aae 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 @@ -25,7 +25,7 @@ public static FileMap of(Map arg, SchemaConfiguration configurat } } - public class File1 implements JsonSchema { + public class File1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -34,10 +34,10 @@ public class File1 implements JsonSchema { Must be named `File` for test. */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("sourceURI", SourceURI.class) )); protected static FileMap getMapOutputInstance(FrozenMap arg) { 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 007f5c37883..e0625b9d974 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 @@ -20,11 +20,11 @@ public static class FilesTuple extends FrozenList { } } - public class Files implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Files extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = File.File1.class; + public static final Class items = File.File1.class; protected static FilesTuple getListOutputInstance(FrozenList arg) { return new FilesTuple(arg); } @@ -42,17 +42,17 @@ public static FileSchemaTestClassMap of(Map arg, SchemaConfigura } } - public class FileSchemaTestClass1 implements JsonSchema { + public class FileSchemaTestClass1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("file", File.File1.class), new AbstractMap.SimpleEntry>("files", Files.class) )); 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 c8578f31a11..4c78b832ef0 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 @@ -21,17 +21,17 @@ public static FooMap of(Map arg, SchemaConfiguration configurati } } - public class Foo1 implements JsonSchema { + public class Foo1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("bar", Bar.Bar1.class) )); protected static FooMap getMapOutputInstance(FrozenMap arg) { 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 31d6d83ab2e..f5daf7eb65d 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 @@ -24,8 +24,8 @@ public class FormatTest { // nest classes so all schemas and input/output classes can be public - public class IntegerSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class IntegerSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, @@ -51,14 +51,14 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { public class Int32 extends Int32JsonSchema {} - public class Int32withValidations implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Int32withValidations extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int32"; + public static final String format = "int32"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(Int32withValidations.class, Long.valueOf(arg), configuration); } @@ -79,8 +79,8 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { public class Int64 extends Int64JsonSchema {} - public class NumberSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class NumberSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, @@ -103,14 +103,14 @@ public static Number validate(Double arg, SchemaConfiguration configuration) { } } - public class FloatSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class FloatSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "float"; + public static final String format = "float"; public static Float validate(Float arg, SchemaConfiguration configuration) { return JsonSchema.validate(FloatSchema.class, arg, configuration); } @@ -119,14 +119,14 @@ public static Float validate(Float arg, SchemaConfiguration configuration) { public class Float32 extends FloatJsonSchema {} - public class DoubleSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class DoubleSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "double"; + public static final String format = "double"; public static Double validate(Double arg, SchemaConfiguration configuration) { return JsonSchema.validate(DoubleSchema.class, arg, configuration); } @@ -144,11 +144,11 @@ public static class ArrayWithUniqueItemsTuple extends FrozenList { } } - public class ArrayWithUniqueItems implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayWithUniqueItems extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static ArrayWithUniqueItemsTuple getListOutputInstance(FrozenList arg) { return new ArrayWithUniqueItemsTuple(arg); } @@ -157,8 +157,8 @@ public static U validate(List arg, SchemaConfigur } } - public class StringSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class StringSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -169,7 +169,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class ByteSchema extends StringJsonSchema {} - public class Binary implements JsonSchema { + public class Binary extends JsonSchema { // BinarySchema } @@ -186,18 +186,18 @@ public class UuidSchema extends UuidJsonSchema {} public class UuidNoExample extends UuidJsonSchema {} - public class Password implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Password extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "password"; + public static final String format = "password"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(Password.class, arg, configuration); } } - public class PatternWithDigits implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PatternWithDigits extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -205,8 +205,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class PatternWithDigitsAndDelimiter implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PatternWithDigitsAndDelimiter extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -226,17 +226,17 @@ public static FormatTestMap of(Map arg, SchemaConfiguration conf } } - public class FormatTest1 implements JsonSchema { + public class FormatTest1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("integer", IntegerSchema.class), new AbstractMap.SimpleEntry>("int32", Int32.class), new AbstractMap.SimpleEntry>("int32withValidations", Int32withValidations.class), @@ -259,7 +259,7 @@ public class FormatTest1 implements JsonSchema { new AbstractMap.SimpleEntry>("pattern_with_digits_and_delimiter", PatternWithDigitsAndDelimiter.class), new AbstractMap.SimpleEntry>("noneProp", NoneProp.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "byte", "date", "number", 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 6a89533d4db..e65bdbf82e9 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 @@ -29,17 +29,17 @@ public static FromSchemaMap of(Map arg, SchemaConfiguration conf } } - public class FromSchema1 implements JsonSchema { + public class FromSchema1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("data", Data.class), new AbstractMap.SimpleEntry>("id", Id.class) )); 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 4f3cac0316a..58615ddea93 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 @@ -28,14 +28,14 @@ public static FruitMap of(Map arg, SchemaConfiguration configura } } - public class Fruit1 implements JsonSchema { + public class Fruit1 extends 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 LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("color", Color.class) )); public static Void validate(Void arg, SchemaConfiguration 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 161e9d0f13f..42e0f29fea6 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 @@ -17,7 +17,7 @@ public class FruitReq { public class Schema0 extends NullJsonSchema {} - public class FruitReq1 implements JsonSchema { + public class FruitReq1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 40a9b1a7f8c..b0a62e918e7 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 @@ -28,14 +28,14 @@ public static GmFruitMap of(Map arg, SchemaConfiguration configu } } - public class GmFruit1 implements JsonSchema { + public class GmFruit1 extends 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 LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("color", Color.class) )); public static Void validate(Void arg, SchemaConfiguration 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 f96cc28374a..64604e93c27 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 @@ -25,20 +25,20 @@ public static GrandparentAnimalMap of(Map arg, SchemaConfigurati } } - public class GrandparentAnimal1 implements JsonSchema { + public class GrandparentAnimal1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("pet_type", PetType.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "pet_type" )); protected static GrandparentAnimalMap getMapOutputInstance(FrozenMap arg) { 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 f74c513725c..d1f39c26abf 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 @@ -28,17 +28,17 @@ public static HasOnlyReadOnlyMap of(Map arg, SchemaConfiguration } } - public class HasOnlyReadOnly1 implements JsonSchema { + public class HasOnlyReadOnly1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("foo", Foo.class) )); 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 5cd21a4d3b3..6212a0ef26b 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 @@ -12,8 +12,8 @@ public class HealthCheckResult { // nest classes so all schemas and input/output classes can be public - public class NullableMessage implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class NullableMessage extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, String.class )); @@ -34,7 +34,7 @@ public static HealthCheckResultMap of(Map arg, SchemaConfigurati } } - public class HealthCheckResult1 implements JsonSchema { + public class HealthCheckResult1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -43,10 +43,10 @@ public class HealthCheckResult1 implements JsonSchema { Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("NullableMessage", NullableMessage.class) )); protected static HealthCheckResultMap getMapOutputInstance(FrozenMap arg) { 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 b0fddd3e742..700b3f7241d 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 @@ -8,14 +8,14 @@ public class IntegerEnum { // nest classes so all schemas and input/output classes can be public - public class IntegerEnum1 implements JsonSchema { + public class IntegerEnum1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 ff40bffd396..b53578be755 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 @@ -8,14 +8,14 @@ public class IntegerEnumBig { // nest classes so all schemas and input/output classes can be public - public class IntegerEnumBig1 implements JsonSchema { + public class IntegerEnumBig1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 ab9a2eeea88..c19057bfdb4 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 @@ -8,14 +8,14 @@ public class IntegerEnumOneValue { // nest classes so all schemas and input/output classes can be public - public class IntegerEnumOneValue1 implements JsonSchema { + public class IntegerEnumOneValue1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 f16fba4e854..de21582fe70 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 @@ -8,14 +8,14 @@ public class IntegerEnumWithDefaultValue { // nest classes so all schemas and input/output classes can be public - public class IntegerEnumWithDefaultValue1 implements JsonSchema { + public class IntegerEnumWithDefaultValue1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 7ce17505f5b..97e83c5fcb2 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 @@ -8,20 +8,20 @@ public class IntegerMax10 { // nest classes so all schemas and input/output classes can be public - public class IntegerMax101 implements JsonSchema { + public class IntegerMax101 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int64"; + public static final String format = "int64"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(IntegerMax101.class, Long.valueOf(arg), configuration); } 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 915af6ac10d..849222d72ac 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 @@ -8,20 +8,20 @@ public class IntegerMin15 { // nest classes so all schemas and input/output classes can be public - public class IntegerMin151 implements JsonSchema { + public class IntegerMin151 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int64"; + public static final String format = "int64"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(IntegerMin151.class, Long.valueOf(arg), configuration); } 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 414db68ecc4..d5c8e97c002 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 @@ -17,8 +17,8 @@ public class IsoscelesTriangle { // nest classes so all schemas and input/output classes can be public - public class TriangleType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class TriangleType extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -35,11 +35,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -51,7 +51,7 @@ public static T validate(Map arg, SchemaCo } - public class IsoscelesTriangle1 implements JsonSchema { + public class IsoscelesTriangle1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 a32562bb690..3e1576ff3d9 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 @@ -20,7 +20,7 @@ public static class ItemsTuple extends FrozenList { } } - public class Items1 implements JsonSchema { + public class Items1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -29,10 +29,10 @@ public class Items1 implements JsonSchema { component's name collides with the inner schema name */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items2.class; + public static final Class items = Items2.class; protected static ItemsTuple getListOutputInstance(FrozenList arg) { return new ItemsTuple(arg); } 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 1024069dc1f..3ad9df777fc 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 @@ -15,7 +15,7 @@ public class JSONPatchRequest { // nest classes so all schemas and input/output classes can be public - public class Items implements JsonSchema { + public class Items extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items.class, arg, configuration); } @@ -71,17 +71,17 @@ public static class JSONPatchRequestTuple extends FrozenList { } } - public class JSONPatchRequest1 implements JsonSchema { + public class JSONPatchRequest1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static JSONPatchRequestTuple getListOutputInstance(FrozenList arg) { return new JSONPatchRequestTuple(arg); } 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 be3be757814..b5354984442 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 @@ -25,8 +25,8 @@ public class Path extends StringJsonSchema {} public class Value extends AnyTypeJsonSchema {} - public class Op implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Op extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -43,22 +43,22 @@ public static JSONPatchRequestAddReplaceTestMap of(Map arg, Sche } } - public class JSONPatchRequestAddReplaceTest1 implements JsonSchema { + public class JSONPatchRequestAddReplaceTest1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("path", Path.class), new AbstractMap.SimpleEntry>("value", Value.class), new AbstractMap.SimpleEntry>("op", Op.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "op", "path", "value" 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 fa1fef3b49e..1ab5f075edf 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 @@ -25,8 +25,8 @@ public class From extends StringJsonSchema {} public class Path extends StringJsonSchema {} - public class Op implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Op extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -43,22 +43,22 @@ public static JSONPatchRequestMoveCopyMap of(Map arg, SchemaConf } } - public class JSONPatchRequestMoveCopy1 implements JsonSchema { + public class JSONPatchRequestMoveCopy1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("from", From.class), new AbstractMap.SimpleEntry>("path", Path.class), new AbstractMap.SimpleEntry>("op", Op.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "from", "op", "path" 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 ec5e14fee23..942a9d28690 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 @@ -22,8 +22,8 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} public class Path extends StringJsonSchema {} - public class Op implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Op extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -40,21 +40,21 @@ public static JSONPatchRequestRemoveMap of(Map arg, SchemaConfig } } - public class JSONPatchRequestRemove1 implements JsonSchema { + public class JSONPatchRequestRemove1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("path", Path.class), new AbstractMap.SimpleEntry>("op", Op.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "op", "path" )); 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 8f88bc48473..45420dc8ec8 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 @@ -13,7 +13,7 @@ public class Mammal { // nest classes so all schemas and input/output classes can be public - public class Mammal1 implements JsonSchema { + public class Mammal1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 73822a188e9..71e6e7975dd 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 @@ -26,8 +26,8 @@ public static AdditionalPropertiesMap of(Map arg, SchemaConfigur } } - public class AdditionalProperties implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class AdditionalProperties extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties1.class; @@ -49,8 +49,8 @@ public static MapMapOfStringMap of(Map arg, SchemaConfiguration } } - public class MapMapOfString implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class MapMapOfString extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; @@ -63,8 +63,8 @@ public static T validate(Map arg, SchemaCo } - public class AdditionalProperties2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class AdditionalProperties2 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -81,8 +81,8 @@ public static MapOfEnumStringMap of(Map arg, SchemaConfiguration } } - public class MapOfEnumString implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class MapOfEnumString extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; @@ -107,8 +107,8 @@ public static DirectMapMap of(Map arg, SchemaConfiguration confi } } - public class DirectMap implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class DirectMap extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties3.class; @@ -130,17 +130,17 @@ public static MapTestMap of(Map arg, SchemaConfiguration configu } } - public class MapTest1 implements JsonSchema { + public class MapTest1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("map_map_of_string", MapMapOfString.class), new AbstractMap.SimpleEntry>("map_of_enum_string", MapOfEnumString.class), new AbstractMap.SimpleEntry>("direct_map", DirectMap.class), 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 6e1ced4b153..ab33683b869 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 @@ -29,8 +29,8 @@ public static MapMap of(Map arg, SchemaConfiguration configurati } } - public class MapSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class MapSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = Animal.Animal1.class; @@ -52,17 +52,17 @@ public static MixedPropertiesAndAdditionalPropertiesClassMap of(Map> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("uuid", UuidSchema.class), new AbstractMap.SimpleEntry>("dateTime", DateTime.class), new AbstractMap.SimpleEntry>("map", MapSchema.class) 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 d0aa92bc1dd..a8967c31118 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 @@ -31,21 +31,21 @@ public static MoneyMap of(Map arg, SchemaConfiguration configura } } - public class Money1 implements JsonSchema { + public class Money1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("amount", Amount.class), new AbstractMap.SimpleEntry>("currency", Currency.Currency1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "amount", "currency" )); 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 cd4d135b639..426a2204970 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 @@ -31,17 +31,17 @@ public static MyObjectDtoMap of(Map arg, SchemaConfiguration con } } - public class MyObjectDto1 implements JsonSchema { + public class MyObjectDto1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Id.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 46736abaa71..e5d69ccffa7 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 @@ -37,7 +37,7 @@ public static NameMap of(Map arg, SchemaConfiguration configurat } } - public class Name1 implements JsonSchema { + public class Name1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -46,12 +46,12 @@ public class Name1 implements JsonSchema { Model for testing model name same as property name */ - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name2.class), new AbstractMap.SimpleEntry>("snake_case", SnakeCase.class), new AbstractMap.SimpleEntry>("property", Property.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "name" )); public static Void validate(Void arg, SchemaConfiguration 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 78449380700..295ec57e6c2 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 @@ -34,21 +34,21 @@ public static NoAdditionalPropertiesMap of(Map arg, SchemaConfig } } - public class NoAdditionalProperties1 implements JsonSchema { + public class NoAdditionalProperties1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("petId", PetId.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "id" )); static final Class additionalProperties = AdditionalProperties.class; 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 b2934f16e15..19ffcfd2494 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 @@ -17,8 +17,8 @@ public class NullableClass { // nest classes so all schemas and input/output classes can be public - public class AdditionalProperties3 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class AdditionalProperties3 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -30,8 +30,8 @@ public static T validate(Map arg, SchemaCo } } - public class IntegerProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class IntegerProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, Integer.class, Long.class, @@ -58,8 +58,8 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } - public class NumberProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class NumberProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, Integer.class, Long.class, @@ -86,8 +86,8 @@ public static Number validate(Double arg, SchemaConfiguration configuration) { } } - public class BooleanProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class BooleanProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, Boolean.class )); @@ -99,8 +99,8 @@ public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { } } - public class StringProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class StringProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, String.class )); @@ -112,12 +112,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class DateProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class DateProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, String.class )); - static final String format = "date"; + public static final String format = "date"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(DateProp.class, arg, configuration); } @@ -126,12 +126,12 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class DatetimeProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class DatetimeProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, String.class )); - static final String format = "date-time"; + public static final String format = "date-time"; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(DatetimeProp.class, arg, configuration); } @@ -149,12 +149,12 @@ public static class ArrayNullablePropTuple extends FrozenList { } } - public class ArrayNullableProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayNullableProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayNullableProp.class, arg, configuration); } @@ -163,8 +163,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Items1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Items1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -182,12 +182,12 @@ public static class ArrayAndItemsNullablePropTuple extends FrozenList { } } - public class ArrayAndItemsNullableProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayAndItemsNullableProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenList.class )); - static final Class items = Items1.class; + public static final Class items = Items1.class; public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayAndItemsNullableProp.class, arg, configuration); } @@ -196,8 +196,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Items2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Items2 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -215,11 +215,11 @@ public static class ArrayItemsNullableTuple extends FrozenList { } } - public class ArrayItemsNullable implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ArrayItemsNullable extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items2.class; + public static final Class items = Items2.class; protected static ArrayItemsNullableTuple getListOutputInstance(FrozenList arg) { return new ArrayItemsNullableTuple(arg); } @@ -240,8 +240,8 @@ public static ObjectNullablePropMap of(Map arg, SchemaConfigurat } } - public class ObjectNullableProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ObjectNullableProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -254,8 +254,8 @@ public static T validate(Map arg, SchemaCo } } - public class AdditionalProperties1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class AdditionalProperties1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -276,8 +276,8 @@ public static ObjectAndItemsNullablePropMap of(Map arg, SchemaCo } } - public class ObjectAndItemsNullableProp implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ObjectAndItemsNullableProp extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -290,8 +290,8 @@ public static T validate(Map arg, SchemaCo } } - public class AdditionalProperties2 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class AdditionalProperties2 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -312,8 +312,8 @@ public static ObjectItemsNullableMap of(Map arg, SchemaConfigura } } - public class ObjectItemsNullable implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ObjectItemsNullable extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties2.class; @@ -335,17 +335,17 @@ public static NullableClassMap of(Map arg, SchemaConfiguration c } } - public class NullableClass1 implements JsonSchema { + public class NullableClass1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("integer_prop", IntegerProp.class), new AbstractMap.SimpleEntry>("number_prop", NumberProp.class), new AbstractMap.SimpleEntry>("boolean_prop", BooleanProp.class), 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 05145a3ba11..8104e2bec8b 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 @@ -17,7 +17,7 @@ public class NullableShape { public class Schema2 extends NullJsonSchema {} - public class NullableShape1 implements JsonSchema { + public class NullableShape1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 6aed26f1913..44ccff18f75 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 @@ -8,14 +8,14 @@ public class NullableString { // nest classes so all schemas and input/output classes can be public - public class NullableString1 implements JsonSchema { + public class NullableString1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, String.class )); 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 b46df94de2c..57c3c843321 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 @@ -25,17 +25,17 @@ public static NumberOnlyMap of(Map arg, SchemaConfiguration conf } } - public class NumberOnly1 implements JsonSchema { + public class NumberOnly1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("JustNumber", JustNumber.class) )); protected static NumberOnlyMap getMapOutputInstance(FrozenMap arg) { 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 c287285df68..75caa48fb40 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 @@ -8,14 +8,14 @@ public class NumberWithValidations { // nest classes so all schemas and input/output classes can be public - public class NumberWithValidations1 implements JsonSchema { + public class NumberWithValidations1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 29690485cae..b35a8139276 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 @@ -25,20 +25,20 @@ public static ObjWithRequiredPropsMap of(Map arg, SchemaConfigur } } - public class ObjWithRequiredProps1 implements JsonSchema { + public class ObjWithRequiredProps1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "a" )); protected static ObjWithRequiredPropsMap getMapOutputInstance(FrozenMap arg) { 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 d377a6d7acf..2ef601a0f7f 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 @@ -25,20 +25,20 @@ public static ObjWithRequiredPropsBaseMap of(Map arg, SchemaConf } } - public class ObjWithRequiredPropsBase1 implements JsonSchema { + public class ObjWithRequiredPropsBase1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("b", B.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "b" )); protected static ObjWithRequiredPropsBaseMap getMapOutputInstance(FrozenMap arg) { 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 52915c33213..4902982029c 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 @@ -28,21 +28,21 @@ public static ObjectModelWithArgAndArgsPropertiesMap of(Map arg, } } - public class ObjectModelWithArgAndArgsProperties1 implements JsonSchema { + public class ObjectModelWithArgAndArgsProperties1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("arg", Arg.class), new AbstractMap.SimpleEntry>("args", Args.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "arg", "args" )); 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 d545b0b926d..820d07c3001 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 @@ -21,7 +21,7 @@ public static ObjectModelWithRefPropsMap of(Map arg, SchemaConfi } } - public class ObjectModelWithRefProps1 implements JsonSchema { + public class ObjectModelWithRefProps1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -30,10 +30,10 @@ public class ObjectModelWithRefProps1 implements JsonSchema { a model that includes properties which should stay primitive (String + Boolean) and one which is defined as a class, NumberWithValidations */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("myNumber", NumberWithValidations.NumberWithValidations1.class), new AbstractMap.SimpleEntry>("myString", StringSchema.StringSchema1.class), new AbstractMap.SimpleEntry>("myBoolean", BooleanSchema.BooleanSchema1.class) 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 a2044d0eb58..3136da1ae03 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 @@ -30,14 +30,14 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "test" )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -49,7 +49,7 @@ public static T validate(Map arg, SchemaCo } - public class ObjectWithAllOfWithReqTestPropFromUnsetAddProp1 implements JsonSchema { + public class ObjectWithAllOfWithReqTestPropFromUnsetAddProp1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 011d287056e..07c68358bd8 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 @@ -28,7 +28,7 @@ public static ObjectWithCollidingPropertiesMap of(Map arg, Schem } } - public class ObjectWithCollidingProperties1 implements JsonSchema { + public class ObjectWithCollidingProperties1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -37,10 +37,10 @@ public class ObjectWithCollidingProperties1 implements JsonSchema { component with properties that have name collisions */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class), new AbstractMap.SimpleEntry>("someprop", Someprop.class) )); 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 074a8eb66a2..e98cf902826 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 @@ -25,17 +25,17 @@ public static ObjectWithDecimalPropertiesMap of(Map arg, SchemaC } } - public class ObjectWithDecimalProperties1 implements JsonSchema { + public class ObjectWithDecimalProperties1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("length", DecimalPayload.DecimalPayload1.class), new AbstractMap.SimpleEntry>("width", Width.class), new AbstractMap.SimpleEntry>("cost", Money.Money1.class) 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 11688dbf86f..51de1031243 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 @@ -33,7 +33,7 @@ public static ObjectWithDifficultlyNamedPropsMap of(Map arg, Sch } } - public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { + public class ObjectWithDifficultlyNamedProps1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -42,15 +42,15 @@ public class ObjectWithDifficultlyNamedProps1 implements JsonSchema { model with properties that have invalid names for python */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("$special[property.name]", Specialpropertyname.class), new AbstractMap.SimpleEntry>("123-list", Schema123list.class), new AbstractMap.SimpleEntry>("123Number", Schema123Number.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "123-list" )); protected static ObjectWithDifficultlyNamedPropsMap getMapOutputInstance(FrozenMap arg) { 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 c8279a595ee..fb09bd32e14 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 @@ -17,8 +17,8 @@ public class ObjectWithInlineCompositionProperty { // 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( + public class Schema0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class SomeProp implements JsonSchema { + public class SomeProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp.class, arg, configuration); } @@ -85,17 +85,17 @@ public static ObjectWithInlineCompositionPropertyMap of(Map arg, } } - public class ObjectWithInlineCompositionProperty1 implements JsonSchema { + public class ObjectWithInlineCompositionProperty1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); protected static ObjectWithInlineCompositionPropertyMap getMapOutputInstance(FrozenMap arg) { 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 7e8b68761ba..42b1d80e42a 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 @@ -21,21 +21,21 @@ public static ObjectWithInvalidNamedRefedPropertiesMap of(Map ar } } - public class ObjectWithInvalidNamedRefedProperties1 implements JsonSchema { + public class ObjectWithInvalidNamedRefedProperties1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("from", FromSchema.FromSchema1.class), new AbstractMap.SimpleEntry>("!reference", ArrayWithValidationsInItems.ArrayWithValidationsInItems1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "!reference", "from" )); 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 5b8db59ceab..8ff55822a5e 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 @@ -29,17 +29,17 @@ public static ObjectWithNonIntersectingValuesMap of(Map arg, Sch } } - public class ObjectWithNonIntersectingValues1 implements JsonSchema { + public class ObjectWithNonIntersectingValues1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 111950152ce..77537293811 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 @@ -35,17 +35,17 @@ public static ObjectWithOnlyOptionalPropsMap of(Map arg, SchemaC } } - public class ObjectWithOnlyOptionalProps1 implements JsonSchema { + public class ObjectWithOnlyOptionalProps1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class), new AbstractMap.SimpleEntry>("b", B.class) )); 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 5fb5e6cbe6e..9c30f6a250b 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 @@ -25,17 +25,17 @@ public static ObjectWithOptionalTestPropMap of(Map arg, SchemaCo } } - public class ObjectWithOptionalTestProp1 implements JsonSchema { + public class ObjectWithOptionalTestProp1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("test", Test.class) )); protected static ObjectWithOptionalTestPropMap getMapOutputInstance(FrozenMap arg) { 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 8669c0c4799..e38a4b900bf 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 @@ -10,14 +10,14 @@ public class ObjectWithValidations { // nest classes so all schemas and input/output classes can be public - public class ObjectWithValidations1 implements JsonSchema { + public class ObjectWithValidations1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); public static T validate(Map arg, SchemaConfiguration configuration) { 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 da3ad0bf334..a8efa21467b 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 @@ -28,8 +28,8 @@ public class Quantity extends Int32JsonSchema {} public class ShipDate extends DateTimeJsonSchema {} - public class Status implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Status extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -49,17 +49,17 @@ public static OrderMap of(Map arg, SchemaConfiguration configura } } - public class Order1 implements JsonSchema { + public class Order1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("petId", PetId.class), new AbstractMap.SimpleEntry>("quantity", Quantity.class), 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 0927944444f..e3a815a1dea 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 @@ -30,11 +30,11 @@ public static class ResultsTuple extends FrozenList { } } - public class Results implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Results extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = MyObjectDto.MyObjectDto1.class; + public static final Class items = MyObjectDto.MyObjectDto1.class; protected static ResultsTuple getListOutputInstance(FrozenList arg) { return new ResultsTuple(arg); } @@ -52,21 +52,21 @@ public static PaginatedResultMyObjectDtoMap of(Map arg, SchemaCo } } - public class PaginatedResultMyObjectDto1 implements JsonSchema { + public class PaginatedResultMyObjectDto1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("count", Count.class), new AbstractMap.SimpleEntry>("results", Results.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "count", "results" )); 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 b345bf33bc0..8b5efd3ee13 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 @@ -10,14 +10,14 @@ public class ParentPet { // nest classes so all schemas and input/output classes can be public - public class ParentPet1 implements JsonSchema { + public class ParentPet1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); public static T validate(Map arg, SchemaConfiguration configuration) { 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 16ae34574b9..9295503d8de 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 @@ -31,11 +31,11 @@ public static class PhotoUrlsTuple extends FrozenList { } } - public class PhotoUrls implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PhotoUrls extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static PhotoUrlsTuple getListOutputInstance(FrozenList arg) { return new PhotoUrlsTuple(arg); } @@ -44,8 +44,8 @@ public static U validate(List arg, SchemaConfigur } } - public class Status implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Status extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -59,11 +59,11 @@ public static class TagsTuple extends FrozenList { } } - public class Tags implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Tags extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Tag.Tag1.class; + public static final Class items = Tag.Tag1.class; protected static TagsTuple getListOutputInstance(FrozenList arg) { return new TagsTuple(arg); } @@ -81,7 +81,7 @@ public static PetMap of(Map arg, SchemaConfiguration configurati } } - public class Pet1 implements JsonSchema { + public class Pet1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -90,10 +90,10 @@ public class Pet1 implements JsonSchema { Pet object that needs to be added to the store */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("category", Category.Category1.class), new AbstractMap.SimpleEntry>("name", Name.class), @@ -101,7 +101,7 @@ public class Pet1 implements JsonSchema { new AbstractMap.SimpleEntry>("tags", Tags.class), new AbstractMap.SimpleEntry>("status", Status.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "name", "photoUrls" )); 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 039a94e9abc..da2bba335dc 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 @@ -13,7 +13,7 @@ public class Pig { // nest classes so all schemas and input/output classes can be public - public class Pig1 implements JsonSchema { + public class Pig1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 b9df6fbc397..2b0becee597 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 @@ -25,7 +25,7 @@ public static PlayerMap of(Map arg, SchemaConfiguration configur } } - public class Player1 implements JsonSchema { + public class Player1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -34,10 +34,10 @@ public class Player1 implements JsonSchema { a model that includes a self reference this forces properties and additionalProperties to be lazy loaded in python models because the Player class has not fully loaded when defining properties */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("enemyPlayer", Player1.class) )); 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 b779a6de4f7..3eb7531bb27 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 @@ -25,7 +25,7 @@ public static PublicKeyMap of(Map arg, SchemaConfiguration confi } } - public class PublicKey1 implements JsonSchema { + public class PublicKey1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -34,10 +34,10 @@ public class PublicKey1 implements JsonSchema { schema that contains a property named key */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("key", Key.class) )); protected static PublicKeyMap getMapOutputInstance(FrozenMap arg) { 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 e33a60b2e7c..6872dd67181 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 @@ -13,7 +13,7 @@ public class Quadrilateral { // nest classes so all schemas and input/output classes can be public - public class Quadrilateral1 implements JsonSchema { + public class Quadrilateral1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 8d8dc966fd8..7e4868d100c 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 @@ -18,8 +18,8 @@ public class QuadrilateralInterface { // nest classes so all schemas and input/output classes can be public - public class ShapeType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ShapeType extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -39,18 +39,18 @@ public static QuadrilateralInterfaceMap of(Map arg, SchemaConfig } } - public class QuadrilateralInterface1 implements JsonSchema { + public class QuadrilateralInterface1 extends 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 LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("shapeType", ShapeType.class), new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "quadrilateralType", "shapeType" )); 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 1f6c69dbb97..7cddf71a457 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 @@ -28,17 +28,17 @@ public static ReadOnlyFirstMap of(Map arg, SchemaConfiguration c } } - public class ReadOnlyFirst1 implements JsonSchema { + public class ReadOnlyFirst1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("bar", Bar.class), new AbstractMap.SimpleEntry>("baz", Baz.class) )); 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 e7969388d1e..c0fdcd6ec86 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 @@ -23,17 +23,17 @@ public static ReqPropsFromExplicitAddPropsMap of(Map arg, Schema } } - public class ReqPropsFromExplicitAddProps1 implements JsonSchema { + public class ReqPropsFromExplicitAddProps1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "invalid-name", "validName" )); 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 d3d0860825a..7c237f65c99 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 @@ -23,17 +23,17 @@ public static ReqPropsFromTrueAddPropsMap of(Map arg, SchemaConf } } - public class ReqPropsFromTrueAddProps1 implements JsonSchema { + public class ReqPropsFromTrueAddProps1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "invalid-name", "validName" )); 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 1e0f3123671..03d674264da 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 @@ -19,17 +19,17 @@ public static ReqPropsFromUnsetAddPropsMap of(Map arg, SchemaCon } } - public class ReqPropsFromUnsetAddProps1 implements JsonSchema { + public class ReqPropsFromUnsetAddProps1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "invalid-name", "validName" )); 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 7b2fed00eb8..ea79377be64 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 @@ -28,7 +28,7 @@ public static ReturnMap of(Map arg, SchemaConfiguration configur } } - public class ReturnSchema1 implements JsonSchema { + public class ReturnSchema1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -37,7 +37,7 @@ public class ReturnSchema1 implements JsonSchema { Model for testing reserved words */ - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("return", ReturnSchema2.class) )); public static Void validate(Void arg, SchemaConfiguration 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 b87464996d3..4148e18e434 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 @@ -17,8 +17,8 @@ public class ScaleneTriangle { // nest classes so all schemas and input/output classes can be public - public class TriangleType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class TriangleType extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -35,11 +35,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -51,7 +51,7 @@ public static T validate(Map arg, SchemaCo } - public class ScaleneTriangle1 implements JsonSchema { + public class ScaleneTriangle1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 92458058a97..78f9382654f 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 @@ -32,7 +32,7 @@ public static Schema200ResponseMap of(Map arg, SchemaConfigurati } } - public class Schema200Response1 implements JsonSchema { + public class Schema200Response1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -41,7 +41,7 @@ public class Schema200Response1 implements JsonSchema { model with an invalid class name for python, starts with a number */ - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("class", ClassSchema.class) )); 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 9291351fb93..6569e5af319 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 @@ -16,17 +16,17 @@ public static class SelfReferencingArrayModelTuple extends FrozenList { } } - public class SelfReferencingArrayModel1 implements JsonSchema { + public class SelfReferencingArrayModel1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = SelfReferencingArrayModel1.class; + public static final Class items = SelfReferencingArrayModel1.class; protected static SelfReferencingArrayModelTuple getListOutputInstance(FrozenList arg) { return new SelfReferencingArrayModelTuple(arg); } 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 cc82fe512ce..d381189f16a 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 @@ -21,17 +21,17 @@ public static SelfReferencingObjectModelMap of(Map arg, SchemaCo } } - public class SelfReferencingObjectModel1 implements JsonSchema { + public class SelfReferencingObjectModel1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("selfRef", SelfReferencingObjectModel1.class) )); static final Class additionalProperties = SelfReferencingObjectModel1.class; 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 34e83f1cf44..9b5a02f89a3 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 @@ -13,7 +13,7 @@ public class Shape { // nest classes so all schemas and input/output classes can be public - public class Shape1 implements JsonSchema { + public class Shape1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 200266b0d19..6f8777404f2 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 @@ -17,7 +17,7 @@ public class ShapeOrNull { public class Schema0 extends NullJsonSchema {} - public class ShapeOrNull1 implements JsonSchema { + public class ShapeOrNull1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 22ccde98d88..d93b2a3c66e 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 @@ -17,8 +17,8 @@ public class SimpleQuadrilateral { // nest classes so all schemas and input/output classes can be public - public class QuadrilateralType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QuadrilateralType extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -35,11 +35,11 @@ public static Schema1Map of(Map arg, SchemaConfiguration configu } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("quadrilateralType", QuadrilateralType.class) )); protected static Schema1Map getMapOutputInstance(FrozenMap arg) { @@ -51,7 +51,7 @@ public static T validate(Map arg, SchemaCo } - public class SimpleQuadrilateral1 implements JsonSchema { + public class SimpleQuadrilateral1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 e5e69d36281..622f19c14f3 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 @@ -13,7 +13,7 @@ public class SomeObject { // nest classes so all schemas and input/output classes can be public - public class SomeObject1 implements JsonSchema { + public class SomeObject1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 e3bf5c566ed..2f5bab876ee 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 @@ -25,7 +25,7 @@ public static SpecialModelnameMap of(Map arg, SchemaConfiguratio } } - public class SpecialModelname1 implements JsonSchema { + public class SpecialModelname1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator @@ -34,10 +34,10 @@ public class SpecialModelname1 implements JsonSchema { model with an invalid class name for python */ - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); protected static SpecialModelnameMap getMapOutputInstance(FrozenMap arg) { 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 d2240138e26..c82ace15b8f 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 @@ -23,14 +23,14 @@ public static StringBooleanMapMap of(Map arg, SchemaConfiguratio } } - public class StringBooleanMap1 implements JsonSchema { + public class StringBooleanMap1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; 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 7328048fa9a..21849d98f46 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 @@ -8,14 +8,14 @@ public class StringEnum { // nest classes so all schemas and input/output classes can be public - public class StringEnum1 implements JsonSchema { + public class StringEnum1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, String.class )); 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 bd0b7a35eb9..601d60062cb 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 @@ -8,14 +8,14 @@ public class StringEnumWithDefaultValue { // nest classes so all schemas and input/output classes can be public - public class StringEnumWithDefaultValue1 implements JsonSchema { + public class StringEnumWithDefaultValue1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 e0b248ae616..567d0bc2055 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 @@ -8,14 +8,14 @@ public class StringWithValidation { // nest classes so all schemas and input/output classes can be public - public class StringWithValidation1 implements JsonSchema { + public class StringWithValidation1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 251d5f08f33..7a5a8570be5 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 @@ -29,17 +29,17 @@ public static TagMap of(Map arg, SchemaConfiguration configurati } } - public class Tag1 implements JsonSchema { + public class Tag1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("name", Name.class) )); 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 422bddd16bd..b355f55a0f2 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 @@ -13,7 +13,7 @@ public class Triangle { // nest classes so all schemas and input/output classes can be public - public class Triangle1 implements JsonSchema { + public class Triangle1 extends JsonSchema { /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator 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 e623b81834a..034866075eb 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 @@ -18,8 +18,8 @@ public class TriangleInterface { // nest classes so all schemas and input/output classes can be public - public class ShapeType implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ShapeType extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -39,18 +39,18 @@ public static TriangleInterfaceMap of(Map arg, SchemaConfigurati } } - public class TriangleInterface1 implements JsonSchema { + public class TriangleInterface1 extends 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 LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("shapeType", ShapeType.class), new AbstractMap.SimpleEntry>("triangleType", TriangleType.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "shapeType", "triangleType" )); 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 23525d05155..dac6ce32779 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 @@ -9,17 +9,17 @@ public class UUIDString { // nest classes so all schemas and input/output classes can be public - public class UUIDString1 implements JsonSchema { + public class UUIDString1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "uuid"; + public static final String format = "uuid"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(UUIDString1.class, arg, configuration); } 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 3e6796aed9d..66653aa0605 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 @@ -50,8 +50,8 @@ public class UserStatus extends Int32JsonSchema {} public class ObjectWithNoDeclaredProps extends MapJsonSchema {} - public class ObjectWithNoDeclaredPropsNullable implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ObjectWithNoDeclaredPropsNullable extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class, FrozenMap.class )); @@ -69,7 +69,7 @@ public class AnyTypeProp extends AnyTypeJsonSchema {} public class Not extends NullJsonSchema {} - public class AnyTypeExceptNullProp implements JsonSchema { + public class AnyTypeExceptNullProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeExceptNullProp.class, arg, configuration); } @@ -131,17 +131,17 @@ public static UserMap of(Map arg, SchemaConfiguration configurat } } - public class User1 implements JsonSchema { + public class User1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Id.class), new AbstractMap.SimpleEntry>("username", Username.class), new AbstractMap.SimpleEntry>("firstName", FirstName.class), 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 60ff28bd634..65ebb720c07 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 @@ -19,8 +19,8 @@ public class HasBaleen extends BooleanJsonSchema {} public class HasTeeth extends BooleanJsonSchema {} - public class ClassName implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ClassName extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -37,22 +37,22 @@ public static WhaleMap of(Map arg, SchemaConfiguration configura } } - public class Whale1 implements JsonSchema { + public class Whale1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("hasBaleen", HasBaleen.class), new AbstractMap.SimpleEntry>("hasTeeth", HasTeeth.class), new AbstractMap.SimpleEntry>("className", ClassName.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "className" )); protected static WhaleMap getMapOutputInstance(FrozenMap arg) { 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 fcb0028f297..bdbce1ca308 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 @@ -16,8 +16,8 @@ public class Zebra { public class AdditionalProperties extends AnyTypeJsonSchema {} - public class Type implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Type extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -25,8 +25,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class ClassName implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class ClassName extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -43,21 +43,21 @@ public static ZebraMap of(Map arg, SchemaConfiguration configura } } - public class Zebra1 implements JsonSchema { + public class Zebra1 extends 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( + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("type", Type.class), new AbstractMap.SimpleEntry>("className", ClassName.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "className" )); static final Class additionalProperties = AdditionalProperties.class; 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 4f66fa657aa..7e14f83527e 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 @@ -28,11 +28,11 @@ public static HeaderParametersMap of(Map arg, SchemaConfiguratio } } - public class HeaderParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class HeaderParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 66f10b67e31..9bf738e8251 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("subDir", Schema1.Schema11.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "subDir" )); static final Class additionalProperties = AdditionalProperties.class; 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 83cb4ac7ac1..2ab2f91dafb 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 @@ -8,8 +8,8 @@ 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( + public class Schema11 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 f3f233c7991..0fa825781ee 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("subDir", PathParamSchema0.PathParamSchema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "subDir" )); static final Class additionalProperties = AdditionalProperties.class; 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 b49ac3e4c25..a92b282fac8 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 @@ -28,11 +28,11 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("searchStr", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 216ddd2a8d2..70b4b550e83 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 @@ -8,8 +8,8 @@ public class PathParamSchema0 { // nest classes so all schemas and input/output classes can be public - public class PathParamSchema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParamSchema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 ff54ac0edf2..622ffc16e60 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 @@ -28,11 +28,11 @@ public static HeaderParametersMap of(Map arg, SchemaConfiguratio } } - public class HeaderParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class HeaderParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someHeader", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 ed1beb44bb0..689bdfe4cbb 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("subDir", PathParamSchema0.PathParamSchema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "subDir" )); static final Class additionalProperties = AdditionalProperties.class; 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 9c41895a768..d0bb6653341 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 @@ -29,15 +29,15 @@ public static HeaderParametersMap of(Map arg, SchemaConfiguratio } } - public class HeaderParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class HeaderParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("required_boolean_group", Schema1.Schema11.class), new AbstractMap.SimpleEntry>("boolean_group", Schema4.Schema41.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "required_boolean_group" )); static final Class additionalProperties = AdditionalProperties.class; 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 6422a96e1de..26dafc8c23f 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 @@ -31,17 +31,17 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("required_string_group", Schema0.Schema01.class), new AbstractMap.SimpleEntry>("int64_group", Schema5.Schema51.class), new AbstractMap.SimpleEntry>("string_group", Schema3.Schema31.class), new AbstractMap.SimpleEntry>("required_int64_group", Schema2.Schema21.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "required_int64_group", "required_string_group" )); 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 710e826fb92..a7e5ad7a4fc 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 @@ -8,8 +8,8 @@ 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( + public class Schema11 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 0f111854b5f..fd50df3fe26 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 @@ -8,8 +8,8 @@ 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( + public class Schema41 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 a53218987cf..8975d0ca038 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 @@ -29,11 +29,11 @@ public static HeaderParametersMap of(Map arg, SchemaConfiguratio } } - public class HeaderParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class HeaderParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("enum_header_string", Schema1.Schema11.class), new AbstractMap.SimpleEntry>("enum_header_string_array", Schema0.Schema01.class) )); 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 35ff37ba5c7..7f499dcd5dd 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 @@ -31,11 +31,11 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("enum_query_double", Schema5.Schema51.class), new AbstractMap.SimpleEntry>("enum_query_string", Schema3.Schema31.class), new AbstractMap.SimpleEntry>("enum_query_integer", Schema4.Schema41.class), 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 961c73f974f..9b54d693e70 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 @@ -10,8 +10,8 @@ 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( + public class Items0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -25,11 +25,11 @@ public static class SchemaTuple0 extends FrozenList { } } - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items0.class; + public static final Class items = Items0.class; protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { return new SchemaTuple0(arg); } 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 561205d1994..9090fbbb7a6 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 @@ -8,8 +8,8 @@ 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( + public class Schema11 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 b1b62560eaf..e5eb9f7e77b 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 @@ -10,8 +10,8 @@ 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( + public class Items2 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -25,11 +25,11 @@ public static class SchemaTuple2 extends FrozenList { } } - public class Schema21 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema21 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items2.class; + public static final Class items = Items2.class; protected static SchemaTuple2 getListOutputInstance(FrozenList arg) { return new SchemaTuple2(arg); } 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 659177d4211..3f4556c6458 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 @@ -8,8 +8,8 @@ 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( + public class Schema31 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { 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 1b0ada867db..89fb784f1b4 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 @@ -8,14 +8,14 @@ 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( + public class Schema41 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int32"; + public static final String format = "int32"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema41.class, Long.valueOf(arg), configuration); } 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 f22f85161bd..3c6fa3721a6 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 @@ -8,14 +8,14 @@ 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( + public class Schema51 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "double"; + public static final String format = "double"; public static Double validate(Double arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema51.class, arg, configuration); } 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 643b3fedd1e..55a3b37e537 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 @@ -14,8 +14,8 @@ 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( + public class Items extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -29,11 +29,11 @@ public static class EnumFormStringArrayTuple extends FrozenList { } } - public class EnumFormStringArray implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class EnumFormStringArray extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static EnumFormStringArrayTuple getListOutputInstance(FrozenList arg) { return new EnumFormStringArrayTuple(arg); } @@ -42,8 +42,8 @@ public static U validate(List arg, SchemaConfigur } } - public class EnumFormString implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class EnumFormString extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -60,11 +60,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("enum_form_string_array", EnumFormStringArray.class), new AbstractMap.SimpleEntry>("enum_form_string", EnumFormString.class) )); 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 eca706de006..b4a99656671 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 @@ -16,8 +16,8 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - public class IntegerSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class IntegerSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, @@ -40,14 +40,14 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } - public class Int32 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Int32 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int32"; + public static final String format = "int32"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(Int32.class, Long.valueOf(arg), configuration); } @@ -68,8 +68,8 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { public class Int64 extends Int64JsonSchema {} - public class NumberSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class NumberSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, @@ -92,34 +92,34 @@ public static Number validate(Double arg, SchemaConfiguration configuration) { } } - public class FloatSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class FloatSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "float"; + public static final String format = "float"; public static Float validate(Float arg, SchemaConfiguration configuration) { return JsonSchema.validate(FloatSchema.class, arg, configuration); } } - public class DoubleSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class DoubleSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "double"; + public static final String format = "double"; public static Double validate(Double arg, SchemaConfiguration configuration) { return JsonSchema.validate(DoubleSchema.class, arg, configuration); } } - public class StringSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class StringSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -127,8 +127,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class PatternWithoutDelimiter implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PatternWithoutDelimiter extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -139,7 +139,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class ByteSchema extends StringJsonSchema {} - public class Binary implements JsonSchema { + public class Binary extends JsonSchema { // BinarySchema } @@ -147,21 +147,21 @@ public class Binary implements JsonSchema { public class Date extends DateJsonSchema {} - public class DateTime implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class DateTime extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "date-time"; + public static final String format = "date-time"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(DateTime.class, arg, configuration); } } - public class Password implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Password extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "password"; + public static final String format = "password"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(Password.class, arg, configuration); } @@ -179,11 +179,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("integer", IntegerSchema.class), new AbstractMap.SimpleEntry>("int32", Int32.class), new AbstractMap.SimpleEntry>("int64", Int64.class), @@ -199,7 +199,7 @@ public class Schema1 implements JsonSchema { new AbstractMap.SimpleEntry>("password", Password.class), new AbstractMap.SimpleEntry>("callback", Callback.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "byte", "double", "number", 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 021d5d05fa0..334ccee2b97 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 @@ -28,14 +28,14 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("query", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "query" )); static final Class additionalProperties = AdditionalProperties.class; 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 c10531e4f6a..8765898e682 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 @@ -30,16 +30,16 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someVar", Schema0.Schema01.class), new AbstractMap.SimpleEntry>("some_var", Schema2.Schema21.class), new AbstractMap.SimpleEntry>("SomeVar", Schema1.Schema11.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "SomeVar", "someVar", "some_var" 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 4748d082830..82880d02c22 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("id", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "id" )); static final Class additionalProperties = AdditionalProperties.class; 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 7007a53f26b..bf90bd9c486 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 @@ -23,8 +23,8 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); static final Class additionalProperties = AdditionalProperties.class; 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 dc642bb2779..4304946637b 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 @@ -29,11 +29,11 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("compositionAtRoot", Schema0.Schema01.class), new AbstractMap.SimpleEntry>("compositionInProperty", Schema1.Schema11.class) )); 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 432843936ec..fbda3b70878 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 @@ -15,8 +15,8 @@ public class Schema0 { // nest classes so all schemas and input/output classes can be public - public class Schema00 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema00 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -24,7 +24,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Schema01 implements JsonSchema { + public class Schema01 extends JsonSchema { public static Void validate(Void 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 067821d158a..10b12af5871 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 @@ -17,8 +17,8 @@ public class Schema1 { // 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( + public class Schema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class SomeProp1 implements JsonSchema { + public class SomeProp1 extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp1.class, arg, configuration); } @@ -85,11 +85,11 @@ public static SchemaMap1 of(Map arg, SchemaConfiguration configu } } - public class Schema11 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema11 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp1.class) )); protected static SchemaMap1 getMapOutputInstance(FrozenMap arg) { 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 6b30ba64013..37fe5d63667 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 @@ -15,8 +15,8 @@ public class Schema { // 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( + public class Schema0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -24,7 +24,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Schema1 implements JsonSchema { + public class Schema1 extends JsonSchema { public static Void validate(Void 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 88171a9e4ee..7db128f2099 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 @@ -17,8 +17,8 @@ public class Schema { // 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( + public class Schema0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class SomeProp implements JsonSchema { + public class SomeProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp.class, arg, configuration); } @@ -85,11 +85,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 1ce9290318a..2b9201df4fe 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 @@ -15,8 +15,8 @@ public class Schema { // 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( + public class Schema0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -24,7 +24,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class Schema1 implements JsonSchema { + public class Schema1 extends JsonSchema { public static Void validate(Void 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 a3ee3a860c7..ff1db2d9f48 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 @@ -17,8 +17,8 @@ public class Schema { // 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( + public class Schema0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -26,7 +26,7 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public class SomeProp implements JsonSchema { + public class SomeProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(SomeProp.class, arg, configuration); } @@ -85,11 +85,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someProp", SomeProp.class) )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 5ef5203497f..65294c499e1 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 @@ -28,15 +28,15 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("param", Param.class), new AbstractMap.SimpleEntry>("param2", Param2.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "param", "param2" )); 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 fd022977927..9380da71266 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 @@ -25,11 +25,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("a", A.class) )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 7f975381152..9bcd4c51ed5 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 @@ -25,11 +25,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("b", B.class) )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 344e4f557df..5d27ca42e48 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 @@ -28,11 +28,11 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("mapBean", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 8e6d0d89262..1d81b8eb9fc 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 @@ -25,11 +25,11 @@ public static SchemaMap0 of(Map arg, SchemaConfiguration configu } } - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("keyword", Keyword0.class) )); protected static SchemaMap0 getMapOutputInstance(FrozenMap arg) { 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 09f0f767511..155a7e4c475 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 @@ -32,11 +32,11 @@ public static CookieParametersMap of(Map arg, SchemaConfiguratio } } - public class CookieParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class CookieParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("1", Schema14.Schema141.class), new AbstractMap.SimpleEntry>("aB", Schema15.Schema151.class), new AbstractMap.SimpleEntry>("Ab", Schema16.Schema161.class), 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 5b456ace4ac..4326d4f5556 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 @@ -31,11 +31,11 @@ public static HeaderParametersMap of(Map arg, SchemaConfiguratio } } - public class HeaderParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class HeaderParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("1", Schema5.Schema51.class), new AbstractMap.SimpleEntry>("aB", Schema6.Schema61.class), new AbstractMap.SimpleEntry>("A-B", Schema8.Schema81.class), 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 3a9cd4f93df..b21b60dbd64 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 @@ -32,18 +32,18 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("1", Schema9.Schema91.class), new AbstractMap.SimpleEntry>("aB", Schema10.Schema101.class), new AbstractMap.SimpleEntry>("Ab", Schema11.Schema111.class), new AbstractMap.SimpleEntry>("A-B", Schema13.Schema131.class), new AbstractMap.SimpleEntry>("self", Schema12.Schema121.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "1", "A-B", "Ab", 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 9c5f86d89c3..96bf75b7f2e 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 @@ -32,11 +32,11 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("1", Schema0.Schema01.class), new AbstractMap.SimpleEntry>("aB", Schema1.Schema11.class), new AbstractMap.SimpleEntry>("Ab", Schema2.Schema21.class), 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 2f2d25b3e81..44ac49791d1 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("petId", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "petId" )); static final Class additionalProperties = AdditionalProperties.class; 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 443cf94b4a4..0e02c520f49 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 @@ -16,7 +16,7 @@ public class Schema { public class AdditionalMetadata extends StringJsonSchema {} - public class RequiredFile implements JsonSchema { + public class RequiredFile extends JsonSchema { // BinarySchema } @@ -30,15 +30,15 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("additionalMetadata", AdditionalMetadata.class), new AbstractMap.SimpleEntry>("requiredFile", RequiredFile.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "requiredFile" )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 7fca5bcda83..bf68241975f 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 @@ -28,14 +28,14 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("someParam", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "someParam" )); static final Class additionalProperties = AdditionalProperties.class; 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 a87bb3012df..b102f4cd6a0 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 @@ -28,11 +28,11 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("mapBean", Foo.Foo1.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 edee80e367b..e85a8f1e500 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 @@ -33,11 +33,11 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("refParam", StringWithValidation.StringWithValidation1.class), new AbstractMap.SimpleEntry>("ioutil", Schema1.Schema11.class), new AbstractMap.SimpleEntry>("context", Schema4.Schema41.class), @@ -45,7 +45,7 @@ public class QueryParameters1 implements JsonSchema { new AbstractMap.SimpleEntry>("pipe", Schema0.Schema01.class), new AbstractMap.SimpleEntry>("url", Schema3.Schema31.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "context", "http", "ioutil", 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 55c74df62c1..912eec3a8d1 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 @@ -20,11 +20,11 @@ public static class SchemaTuple0 extends FrozenList { } } - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items0.class; + public static final Class items = Items0.class; protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { return new SchemaTuple0(arg); } 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 25388bb3bbb..8596a23aab3 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 @@ -20,11 +20,11 @@ public static class SchemaTuple1 extends FrozenList { } } - public class Schema11 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema11 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items1.class; + public static final Class items = Items1.class; protected static SchemaTuple1 getListOutputInstance(FrozenList arg) { return new SchemaTuple1(arg); } 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 3888c22c60b..97aad9edd2d 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 @@ -20,11 +20,11 @@ public static class SchemaTuple2 extends FrozenList { } } - public class Schema21 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema21 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items2.class; + public static final Class items = Items2.class; protected static SchemaTuple2 getListOutputInstance(FrozenList arg) { return new SchemaTuple2(arg); } 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 2e900e9c278..332574a3750 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 @@ -20,11 +20,11 @@ public static class SchemaTuple3 extends FrozenList { } } - public class Schema31 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema31 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items3.class; + public static final Class items = Items3.class; protected static SchemaTuple3 getListOutputInstance(FrozenList arg) { return new SchemaTuple3(arg); } 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 e9b3d8c052b..28153c3e155 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 @@ -20,11 +20,11 @@ public static class SchemaTuple4 extends FrozenList { } } - public class Schema41 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema41 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items4.class; + public static final Class items = Items4.class; protected static SchemaTuple4 getListOutputInstance(FrozenList arg) { return new SchemaTuple4(arg); } 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 1ca917b6c4b..22f19e31a97 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 @@ -5,7 +5,7 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 implements JsonSchema { + public class Schema1 extends JsonSchema { // 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 6e8517fc24c..00980451a13 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 @@ -5,7 +5,7 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - public class Schema1 implements JsonSchema { + public class Schema1 extends JsonSchema { // 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 2b54ee96958..46f5dbe57ac 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 @@ -16,7 +16,7 @@ public class Schema { public class AdditionalMetadata extends StringJsonSchema {} - public class File implements JsonSchema { + public class File extends JsonSchema { // BinarySchema } @@ -30,15 +30,15 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("additionalMetadata", AdditionalMetadata.class), new AbstractMap.SimpleEntry>("file", File.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "file" )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 dc155a1957a..b4de40ad5e0 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 @@ -14,7 +14,7 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - public class Items implements JsonSchema { + public class Items extends JsonSchema { // BinarySchema } @@ -25,11 +25,11 @@ public static class FilesTuple extends FrozenList { } } - public class Files implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Files extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items.class; + public static final Class items = Items.class; protected static FilesTuple getListOutputInstance(FrozenList arg) { return new FilesTuple(arg); } @@ -47,11 +47,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("files", Files.class) )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 75d9828fbe2..8f98af50ca2 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 @@ -22,11 +22,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("string", Foo.Foo1.class) )); protected static SchemaMap getMapOutputInstance(FrozenMap arg) { 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 0eae3e08582..f5b54f2cbf2 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 @@ -28,14 +28,14 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("status", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "status" )); static final Class additionalProperties = AdditionalProperties.class; 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 d86908af833..5a4e94308d7 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 @@ -10,8 +10,8 @@ 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( + public class Items0 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); public static String validate(String arg, SchemaConfiguration configuration) { @@ -25,11 +25,11 @@ public static class SchemaTuple0 extends FrozenList { } } - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items0.class; + public static final Class items = Items0.class; protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { return new SchemaTuple0(arg); } 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 592523bcbac..ae862ffc018 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 @@ -28,14 +28,14 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("tags", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "tags" )); static final Class additionalProperties = AdditionalProperties.class; 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 ad0f7a3555c..d0d1eee8c0a 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 @@ -20,11 +20,11 @@ public static class SchemaTuple0 extends FrozenList { } } - public class Schema01 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); - static final Class items = Items0.class; + public static final Class items = Items0.class; protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { return new SchemaTuple0(arg); } 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 e4fd4294a66..46213f940e3 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 @@ -28,11 +28,11 @@ public static HeaderParametersMap of(Map arg, SchemaConfiguratio } } - public class HeaderParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class HeaderParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("api_key", Schema0.Schema01.class) )); static final Class additionalProperties = AdditionalProperties.class; 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 822962cdc33..aad74ef518b 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("petId", Schema1.Schema11.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "petId" )); static final Class additionalProperties = AdditionalProperties.class; 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 d8dd8b988fe..b54ea11eec1 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("petId", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "petId" )); static final Class additionalProperties = AdditionalProperties.class; 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 ac944850034..9c2a212ff8d 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("petId", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "petId" )); static final Class additionalProperties = AdditionalProperties.class; 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 e586269fd5d..54a4e5bcb89 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 @@ -28,11 +28,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("name", Name.class), new AbstractMap.SimpleEntry>("status", Status.class) )); 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 5294825d26c..a82d1c13cff 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("petId", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "petId" )); static final Class additionalProperties = AdditionalProperties.class; 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 dda0f7fa592..7e43689a33f 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 @@ -16,7 +16,7 @@ public class Schema { public class AdditionalMetadata extends StringJsonSchema {} - public class File implements JsonSchema { + public class File extends JsonSchema { // BinarySchema } @@ -30,11 +30,11 @@ public static SchemaMap of(Map arg, SchemaConfiguration configur } } - public class Schema1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Schema1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("additionalMetadata", AdditionalMetadata.class), new AbstractMap.SimpleEntry>("file", File.class) )); 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 f55b2b8c865..d2b6ffeeb72 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("order_id", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "order_id" )); static final Class additionalProperties = AdditionalProperties.class; 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 d5cd1bf9409..486ae44a8ed 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("order_id", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "order_id" )); static final Class additionalProperties = AdditionalProperties.class; 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 ab65c1784e8..ff2136c2738 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 @@ -8,14 +8,14 @@ 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( + public class Schema01 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, Double.class )); - static final String format = "int64"; + public static final String format = "int64"; public static Long validate(Integer arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, Long.valueOf(arg), configuration); } 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 77b4bb5d34d..e11ebd42475 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 @@ -29,15 +29,15 @@ public static QueryParametersMap of(Map arg, SchemaConfiguration } } - public class QueryParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class QueryParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("password", Schema1.Schema11.class), new AbstractMap.SimpleEntry>("username", Schema0.Schema01.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "password", "username" )); 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 7d228d6c95d..916d619ba71 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 @@ -32,18 +32,18 @@ public static HeadersMap of(Map arg, SchemaConfiguration configu } } - public class Headers1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class Headers1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("X-Rate-Limit", XRateLimitSchema.XRateLimitSchema1.class), new AbstractMap.SimpleEntry>("int32", Int32JsonContentTypeHeaderSchema.Int32JsonContentTypeHeaderSchema1.class), new AbstractMap.SimpleEntry>("X-Expires-After", XExpiresAfterSchema.XExpiresAfterSchema1.class), new AbstractMap.SimpleEntry>("ref-content-schema-header", StringWithValidation.StringWithValidation1.class), new AbstractMap.SimpleEntry>("numberHeader", NumberHeaderSchema.NumberHeaderSchema1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "X-Rate-Limit", "int32", "ref-content-schema-header" 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 837a81f2ca4..47d51b95ef6 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("username", Schema.Schema1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "username" )); static final Class additionalProperties = AdditionalProperties.class; 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 f0e2dc0c67c..c6b3ba11d58 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("username", Schema.Schema1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "username" )); static final Class additionalProperties = AdditionalProperties.class; 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 e7819a04ea3..e99a31e069f 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 @@ -28,14 +28,14 @@ public static PathParametersMap of(Map arg, SchemaConfiguration } } - public class PathParameters1 implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + public class PathParameters1 extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); - static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( new AbstractMap.SimpleEntry>("username", Schema.Schema1.class) )); - static final Set required = new LinkedHashSet<>(Set.of( + public static final Set required = new LinkedHashSet<>(Set.of( "username" )); static final Class additionalProperties = AdditionalProperties.class; 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 2a4056fbd9f..9c270c13d0c 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 @@ -9,7 +9,7 @@ import java.util.UUID; -public class AnyTypeJsonSchema implements JsonSchema { +public class AnyTypeJsonSchema extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java index 6883d55bd6a..37c9b3b619a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class BooleanJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class BooleanJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Boolean.class )); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java index 934ab7eeece..b9f5d12ee89 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class DateJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DateJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); static final String format = "date"; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java index fb3379701cb..1047b16c690 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class DateTimeJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DateTimeJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); static final String format = "date-time"; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java index bfd46e52498..6ae5a1b5e37 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class DecimalJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DecimalJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); static final String format = "number"; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java index 0c68c0162f6..bc278e7e89b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class DoubleJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DoubleJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Double.class )); static final String format = "double"; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java index 6d1b12f12b7..dc111d0d5f0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class FloatJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class FloatJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Float.class )); static final String format = "float"; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java index 61bb171c5cf..9e741214cac 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class Int32JsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class Int32JsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Float.class )); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java index 430f47b0f0f..487b1ffd186 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class Int64JsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class Int64JsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java index 91774856f15..39b9c3b6533 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class IntJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class IntJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Long.class )); static final String format = "int"; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java index 5c07f836f6b..8d9c63e964e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java @@ -2,6 +2,9 @@ import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.SchemaValidator; +import org.openapijsonschematools.schemas.validation.PathToSchemasMap; +import org.openapijsonschematools.schemas.validation.ValidationMetadata; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -17,7 +20,7 @@ import java.util.Set; import java.util.UUID; -public interface JsonSchema extends SchemaValidator { +public abstract class JsonSchema extends SchemaValidator { private static Object castToAllowedTypes(Object arg, List pathToItem, PathToTypeMap pathToType) { if (arg == null) { pathToType.put(pathToItem, Void.class); @@ -84,7 +87,7 @@ private static PathToSchemasMap getPathToSchemas(Class cls, Object a if (validationMetadata.validationRanEarlier(cls)) { // todo add deeper validated schemas } else { - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(cls, arg, validationMetadata); + PathToSchemasMap otherPathToSchemas = validate(cls, arg, validationMetadata); pathToSchemasMap.update(otherPathToSchemas); for (LinkedHashMap, Void> schemas: pathToSchemasMap.values()) { Class firstSchema = schemas.entrySet().iterator().next().getKey(); @@ -163,51 +166,51 @@ private static Object getNewInstance(Class cls, Object arg, List cls, Void arg, SchemaConfiguration configuration) { + protected static Void validate(Class cls, Void arg, SchemaConfiguration configuration) { return (Void) validateObject(cls, arg, configuration); } - static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { + protected static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { return (Boolean) validateObject(cls, arg, configuration); } - static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { + protected static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { return (Integer) validateObject(cls, arg, configuration); } - static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { + protected static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { return (Long) validateObject(cls, arg, configuration); } - static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { + protected static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { return (Float) validateObject(cls, arg, configuration); } - static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { + protected static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { return (Double) validateObject(cls, arg, configuration); } - static String validate(Class cls, String arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, String arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static T validate(Class cls, Map arg, SchemaConfiguration configuration) { + protected static T validate(Class cls, Map arg, SchemaConfiguration configuration) { return (T) validateObject(cls, arg, configuration); } - static U validate(Class cls, List arg, SchemaConfiguration configuration) { + protected static U validate(Class cls, List arg, SchemaConfiguration configuration) { return (U) validateObject(cls, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchemas.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchemas.java deleted file mode 100644 index 9d49ced698d..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchemas.java +++ /dev/null @@ -1,320 +0,0 @@ -package org.openapijsonschematools.schemas; - -import org.openapijsonschematools.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; - -public class JsonSchemas { - // holds all standard json schema types - - public class AnyTypeSchema implements JsonSchema { - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static Integer validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static Float validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static Double validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static T validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - - public static U validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(AnyTypeSchema.class, arg, configuration); - } - } - public class BooleanSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Boolean.class - )); - - public static Boolean validate(Boolean arg, SchemaConfiguration configuration) { - return JsonSchema.validate(BooleanSchema.class, arg, configuration); - } - } - public class DateSchema 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(DateSchema.class, arg, configuration); - } - - public static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(DateSchema.class, arg, configuration); - } - } - public class DateTimeSchema 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(DateTimeSchema.class, arg, configuration); - } - - public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(DateTimeSchema.class, arg, configuration); - } - } - public class DecimalSchema 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(DecimalSchema.class, arg, configuration); - } - } - public class DoubleSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Double.class - )); - static final String format = "double"; - - public static Double validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(DoubleSchema.class, arg, configuration); - } - } - public class FloatSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Float.class - )); - static final String format = "float"; - - public static Float validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(FloatSchema.class, arg, configuration); - } - } - public class Int32Schema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Integer.class, - Float.class - )); - static final String format = "int32"; - - public static Integer validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Int32Schema.class, arg, configuration); - } - - public static Integer validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Int32Schema.class, Integer.parseInt(arg.toString()), configuration); - } - } - public class Int64Schema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Integer.class, - Long.class, - Float.class, - Double.class - )); - static final String format = "int64"; - - public static Long validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Int64Schema.class, Long.valueOf(arg), configuration); - } - - public static Long validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Int64Schema.class, Long.parseLong(arg.toString()), configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Int64Schema.class, arg, configuration); - } - - public static Long validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(Int64Schema.class, Long.parseLong(arg.toString()), configuration); - } - } - public class IntSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Long.class - )); - static final String format = "int"; - - public static Long validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(IntSchema.class, Long.valueOf(arg), configuration); - } - - public static Long validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(IntSchema.class, Long.parseLong(arg.toString()), configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(IntSchema.class, arg, configuration); - } - - public static Long validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(IntSchema.class, Long.parseLong(arg.toString()), configuration); - } - } - public class ListSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenList.class - )); - - public static FrozenList validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ListSchema.class, arg, configuration); - } - } - public class MapSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - - public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(MapSchema.class, arg, configuration); - } - } - public class NotAnyTypeSchema implements JsonSchema { - // todo add not definition here when that validator is added - } - public class NullSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Void.class - )); - - public static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(NullSchema.class, arg, configuration); - } - } - public class NumberSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - Integer.class, - Long.class, - Float.class, - Double.class - )); - - public static Number validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(NumberSchema.class, arg, configuration); - } - - public static Number validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(NumberSchema.class, arg, configuration); - } - - public static Number validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(NumberSchema.class, arg, configuration); - } - - public static Number validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(NumberSchema.class, arg, configuration); - } - } - public class StringSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - String.class - )); - - public static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(StringSchema.class, arg, configuration); - } - - public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(StringSchema.class, arg, configuration); - } - - public static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(StringSchema.class, arg, configuration); - } - } - public class UnsetAnyTypeSchema implements JsonSchema { - static Void validate(Void arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static Boolean validate(Boolean arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static Integer validate(Integer arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - public static Long validate(Long arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static Float validate(Float arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static Double validate(Double arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static String validate(String arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static String validate(ZonedDateTime arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static String validate(LocalDate arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static T validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - - static U validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UnsetAnyTypeSchema.class, arg, configuration); - } - } - 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 static String validate(UUID arg, SchemaConfiguration configuration) { - return JsonSchema.validate(UuidSchema.class, arg, configuration); - } - } -} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java index a5201ca34cb..8070d83734b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class ListJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class ListJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java index 473569422e8..fd02043fdc4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class MapJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class MapJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java index af5421ee45b..7458ad76ec1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java @@ -11,6 +11,6 @@ import java.util.UUID; -public class NotAnyTypeJsonSchema implements JsonSchema { +public class NotAnyTypeJsonSchema extends JsonSchema { // todo add not definition here when that validator is added } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java index 9b8d83c59ad..e8c3ba5c0d4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class NullJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class NullJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class )); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java index 27fb90f9163..1cfdd7d9a5b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java @@ -11,8 +11,8 @@ import java.util.UUID; -public class NumberJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class NumberJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 96e0881b46c..1bc223cd820 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 @@ -11,8 +11,8 @@ import java.util.UUID; -public class StringJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class StringJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java index 0eb8458c6a9..9c5d29eab5b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java @@ -11,7 +11,7 @@ import java.util.UUID; -public class UnsetAnyTypeJsonSchema implements JsonSchema { +public class UnsetAnyTypeJsonSchema extends JsonSchema { static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(UnsetAnyTypeJsonSchema.class, arg, configuration); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java index d3e55278ddc..f56220c6e99 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java @@ -11,11 +11,11 @@ import java.util.UUID; -public class UuidJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class UuidJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "uuid"; + public static final String format = "uuid"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(UuidJsonSchema.class, arg, configuration); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java similarity index 83% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidator.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java index e510d21a591..98e24e61cb1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java @@ -1,9 +1,6 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; -import org.openapijsonschematools.schemas.PathToSchemasMap; import org.openapijsonschematools.schemas.JsonSchema; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -14,7 +11,7 @@ public class AdditionalPropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/CustomIsoparser.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/CustomIsoparser.java similarity index 84% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/CustomIsoparser.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/CustomIsoparser.java index 620b2364a0f..b61e057c9ef 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/CustomIsoparser.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/CustomIsoparser.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import java.time.ZonedDateTime; import java.time.LocalDate; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java new file mode 100644 index 00000000000..321dc9b5396 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java @@ -0,0 +1,8 @@ +package org.openapijsonschematools.schemas.validation; + +public class FakeValidator implements KeywordValidator { + @Override + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + return null; + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/FormatValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java similarity index 93% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/FormatValidator.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java index e9b44b8fd61..23a2776d945 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/FormatValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java @@ -1,9 +1,4 @@ -package org.openapijsonschematools.schemas.validators; - -import org.openapijsonschematools.schemas.CustomIsoparser; -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; +package org.openapijsonschematools.schemas.validation; import java.math.BigDecimal; import java.math.BigInteger; @@ -138,7 +133,7 @@ private Void validateStringFormat(String arg, String format, ValidationMetadata } @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { String format = (String) constraint; if (arg instanceof Number) { validateNumericFormat( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/ItemsValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java similarity index 78% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/ItemsValidator.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java index 35b86dfc63d..82af731d418 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/ItemsValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java @@ -1,16 +1,13 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; -import org.openapijsonschematools.schemas.PathToSchemasMap; import org.openapijsonschematools.schemas.JsonSchema; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.List; public class ItemsValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof List)) { return null; } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java new file mode 100644 index 00000000000..c05dc9608fb --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java @@ -0,0 +1,10 @@ +package org.openapijsonschematools.schemas.validation; + +public interface KeywordValidator { + PathToSchemasMap validate( + Class cls, + Object arg, + Object constraint, + ValidationMetadata validationMetadata, + Object extra); +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/PathToSchemasMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java similarity index 92% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/PathToSchemasMap.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java index 9c9b9465998..b9147bcf658 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/PathToSchemasMap.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import java.util.LinkedHashMap; import java.util.List; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/PropertiesValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java similarity index 81% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/PropertiesValidator.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java index e376bae076d..fe93e31169f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/PropertiesValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java @@ -1,9 +1,6 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; -import org.openapijsonschematools.schemas.PathToSchemasMap; import org.openapijsonschematools.schemas.JsonSchema; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -13,7 +10,7 @@ public class PropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/RequiredValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java similarity index 72% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/RequiredValidator.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java index 2aff713169b..e26b25724a4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/RequiredValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java @@ -1,8 +1,4 @@ -package org.openapijsonschematools.schemas.validators; - -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; +package org.openapijsonschematools.schemas.validation; import java.util.HashSet; import java.util.List; @@ -11,7 +7,7 @@ public class RequiredValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/SchemaValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java similarity index 50% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/SchemaValidator.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java index 3a1c4b54561..dc804f1b661 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/SchemaValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java @@ -1,13 +1,6 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; -import org.openapijsonschematools.schemas.validators.AdditionalPropertiesValidator; -import org.openapijsonschematools.schemas.validators.FakeValidator; -import org.openapijsonschematools.schemas.validators.FormatValidator; -import org.openapijsonschematools.schemas.validators.ItemsValidator; -import org.openapijsonschematools.schemas.validators.KeywordValidator; -import org.openapijsonschematools.schemas.validators.PropertiesValidator; -import org.openapijsonschematools.schemas.validators.RequiredValidator; -import org.openapijsonschematools.schemas.validators.TypeValidator; +import org.openapijsonschematools.schemas.JsonSchema; import java.lang.reflect.Field; import java.util.HashMap; @@ -16,7 +9,7 @@ import java.util.List; import java.util.Map; -public interface SchemaValidator { +public abstract class SchemaValidator { static HashMap keywordToValidator = new HashMap(){{ put("allOf", new FakeValidator()); put("anyOf", new FakeValidator()); @@ -60,17 +53,17 @@ public interface SchemaValidator { put("unevaluatedProperties", new FakeValidator()); }}; - static PathToSchemasMap validate( - Class schemaCls, + protected static PathToSchemasMap validate( + Class schemaCls, Object arg, ValidationMetadata validationMetadata ) { HashMap fieldsToValues = new HashMap<>(); LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); - Class usedSchemaCls = schemaCls; - if (schemaCls.getSuperclass() != Object.class) { + Class usedSchemaCls = schemaCls; + if (schemaCls.getSuperclass() != JsonSchema.class) { // only ref with no adjacent properties supported at this time - usedSchemaCls = schemaCls.getSuperclass(); + usedSchemaCls = (Class) schemaCls.getSuperclass(); } Field[] fields = usedSchemaCls.getDeclaredFields(); for (Field field : fields) { @@ -93,7 +86,6 @@ static PathToSchemasMap validate( } Object extra = null; PathToSchemasMap pathToSchemas = new PathToSchemasMap(); - Class castSchemaCls = (Class) schemaCls; for (Map.Entry entry: fieldsToValues.entrySet()) { String jsonKeyword = entry.getKey(); Object constraint = entry.getValue(); @@ -102,7 +94,7 @@ static PathToSchemasMap validate( } KeywordValidator validatorClass = keywordToValidator.get(jsonKeyword); PathToSchemasMap otherPathToSchemas = validatorClass.validate( - castSchemaCls, + schemaCls, arg, constraint, validationMetadata, @@ -129,86 +121,3 @@ static PathToSchemasMap validate( return pathToSchemas; } } -/** - * @classmethod - * def _validate( - * cls, - * arg, - * validation_metadata: ValidationMetadata, - * ) -> PathToSchemasType: - * """ - * SchemaValidator validate - * All keyword validation except for type checking was done in calling stack frames - * If those validations passed, the validated classes are collected in path_to_schemas - * """ - * cls_schema = cls() - * json_schema_data = { - * k: v - * for k, v in vars(cls_schema).items() - * if k not in cls.__excluded_cls_properties - * and k - * not in validation_metadata.configuration.disabled_json_schema_python_keywords - * } - * contains_path_to_schemas = [] - * path_to_schemas: PathToSchemasType = {} - * if 'contains' in vars(cls_schema): - * contains_path_to_schemas = _get_contains_path_to_schemas( - * arg, - * vars(cls_schema)['contains'], - * validation_metadata, - * path_to_schemas - * ) - * if_path_to_schemas = None - * if 'if_' in vars(cls_schema): - * if_path_to_schemas = _get_if_path_to_schemas( - * arg, - * vars(cls_schema)['if_'], - * validation_metadata, - * ) - * validated_pattern_properties: typing.Optional[PathToSchemasType] = None - * if 'pattern_properties' in vars(cls_schema): - * validated_pattern_properties = _get_validated_pattern_properties( - * arg, - * vars(cls_schema)['pattern_properties'], - * cls, - * validation_metadata - * ) - * prefix_items_length = 0 - * if 'prefix_items' in vars(cls_schema): - * prefix_items_length = len(vars(cls_schema)['prefix_items']) - * for keyword, val in json_schema_data.items(): - * used_val: typing.Any - * if keyword in {'contains', 'min_contains', 'max_contains'}: - * used_val = (val, contains_path_to_schemas) - * elif keyword == 'items': - * used_val = (val, prefix_items_length) - * elif keyword in {'unevaluated_items', 'unevaluated_properties'}: - * used_val = (val, path_to_schemas) - * elif keyword in {'types'}: - * format: typing.Optional[str] = vars(cls_schema).get('format', None) - * used_val = (val, format) - * elif keyword in {'pattern_properties', 'additional_properties'}: - * used_val = (val, validated_pattern_properties) - * elif keyword in {'if_', 'then', 'else_'}: - * used_val = (val, if_path_to_schemas) - * else: - * used_val = val - * validator = json_schema_keyword_to_validator[keyword] - * - * other_path_to_schemas = validator( - * arg, - * used_val, - * cls, - * validation_metadata, - * - * ) - * if other_path_to_schemas: - * update(path_to_schemas, other_path_to_schemas) - * - * base_class = type(arg) - * if validation_metadata.path_to_item not in path_to_schemas: - * path_to_schemas[validation_metadata.path_to_item] = dict() - * path_to_schemas[validation_metadata.path_to_item][base_class] = None - * path_to_schemas[validation_metadata.path_to_item][cls] = None - * return path_to_schemas - */ diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/TypeValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java similarity index 54% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/TypeValidator.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java index de00d1459e4..614da561230 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/TypeValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java @@ -1,14 +1,10 @@ -package org.openapijsonschematools.schemas.validators; - -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; +package org.openapijsonschematools.schemas.validation; import java.util.HashSet; public class TypeValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { HashSet> types = (HashSet>) constraint; Class argClass; if (arg == null) { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ValidationMetadata.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java similarity index 92% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ValidationMetadata.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java index d15f5daa8ec..6974f649156 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ValidationMetadata.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import org.openapijsonschematools.configurations.SchemaConfiguration; import java.util.List; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/FakeValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/FakeValidator.java deleted file mode 100644 index c0010c0d90f..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/FakeValidator.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.openapijsonschematools.schemas.validators; - -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; - -public class FakeValidator implements KeywordValidator { - @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { - return null; - } -} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/KeywordValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/KeywordValidator.java deleted file mode 100644 index 73ca6e76c81..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validators/KeywordValidator.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.openapijsonschematools.schemas.validators; - -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; - -public interface KeywordValidator { - PathToSchemasMap validate( - Class cls, - Object arg, - Object constraint, - ValidationMetadata validationMetadata, - Object extra); -} diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java index 1bc2c43d684..20b4d9a52bf 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java @@ -10,44 +10,45 @@ import java.util.List; import java.util.Set; -class ArrayWithItemsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenList.class - )); - static final Class items = StringJsonSchema.class; - - public static FrozenList validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ArrayWithItemsSchema.class, arg, configuration); - } -} -class ArrayWithOutputClsSchemaList extends FrozenList { - ArrayWithOutputClsSchemaList(FrozenList m) { - super(m); - } +public class ArrayTypeSchemaTest { + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + + public class ArrayWithItemsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenList.class + )); + public static final Class items = StringJsonSchema.class; - public static ArrayWithOutputClsSchemaList of(List arg, SchemaConfiguration configuration) { - return ArrayWithOutputClsSchema.validate(arg, configuration); + public static FrozenList validate(List arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ArrayWithItemsSchema.class, arg, configuration); + } } -} -class ArrayWithOutputClsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenList.class - )); - static final Class items = StringJsonSchema.class; + public static class ArrayWithOutputClsSchemaList extends FrozenList { + ArrayWithOutputClsSchemaList(FrozenList m) { + super(m); + } - protected static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { - return new ArrayWithOutputClsSchemaList(arg); + public static ArrayWithOutputClsSchemaList of(List arg, SchemaConfiguration configuration) { + return ArrayWithOutputClsSchema.validate(arg, configuration); + } } - public static ArrayWithOutputClsSchemaList validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ArrayWithOutputClsSchema.class, arg, configuration); - } -} + public class ArrayWithOutputClsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenList.class + )); + public static final Class items = StringJsonSchema.class; -public class ArrayTypeSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + protected static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { + return new ArrayWithOutputClsSchemaList(arg); + } + + public static ArrayWithOutputClsSchemaList validate(List arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ArrayWithOutputClsSchema.class, arg, configuration); + } + } @Test public void testExceptionThrownForInvalidType() { diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java index abc3bae649c..6295063d94f 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java @@ -11,74 +11,75 @@ import java.util.Map; import java.util.Set; -class ObjectWithPropsSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) - )); - - public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithPropsSchema.class, arg, configuration); - } -} -class ObjectWithAddpropsSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final Class additionalProperties = StringJsonSchema.class; +public class ObjectTypeSchemaTest { + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + + public class ObjectWithPropsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) + )); - public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithAddpropsSchema.class, arg, configuration); + public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithPropsSchema.class, arg, configuration); + } } -} -class ObjectWithPropsAndAddpropsSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) - )); - public static final Class additionalProperties = BooleanJsonSchema.class; - - public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithPropsAndAddpropsSchema.class, arg, configuration); + public class ObjectWithAddpropsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final Class additionalProperties = StringJsonSchema.class; + + public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithAddpropsSchema.class, arg, configuration); + } } -} -class ObjectWithOutputTypeSchemaMap extends FrozenMap { - ObjectWithOutputTypeSchemaMap(FrozenMap m) { - super(m); + public class ObjectWithPropsAndAddpropsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) + )); + public static final Class additionalProperties = BooleanJsonSchema.class; + + public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithPropsAndAddpropsSchema.class, arg, configuration); + } } - public static ObjectWithOutputTypeSchemaMap of(Map arg, SchemaConfiguration configuration) { - return ObjectWithOutputTypeSchema.validate(arg, configuration); + public static class ObjectWithOutputTypeSchemaMap extends FrozenMap { + ObjectWithOutputTypeSchemaMap(FrozenMap m) { + super(m); + } + + public static ObjectWithOutputTypeSchemaMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithOutputTypeSchema.validate(arg, configuration); + } } -} -class ObjectWithOutputTypeSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) - )); + public class ObjectWithOutputTypeSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) + )); - static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { - return new ObjectWithOutputTypeSchemaMap(arg); - } + protected static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithOutputTypeSchemaMap(arg); + } - public static ObjectWithOutputTypeSchemaMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithOutputTypeSchema.class, arg, configuration); + public static ObjectWithOutputTypeSchemaMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithOutputTypeSchema.class, arg, configuration); + } } -} - -public class ObjectTypeSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); @Test public void testExceptionThrownForInvalidType() { diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java similarity index 94% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java index 743d71bb7a4..beeaae0c6d2 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/AdditionalPropertiesValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java @@ -1,14 +1,11 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; import org.openapijsonschematools.schemas.StringJsonSchema; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/CustomIsoparserTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/CustomIsoparserTest.java similarity index 93% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/CustomIsoparserTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/CustomIsoparserTest.java index ac475c05ab6..5247e85cad9 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/CustomIsoparserTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/CustomIsoparserTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import java.time.LocalDate; import java.time.ZonedDateTime; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/FormatValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java similarity index 97% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/FormatValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java index 1c651e6172a..f6eccba4338 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/FormatValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java @@ -1,12 +1,9 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/ItemsValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java similarity index 93% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/ItemsValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java index ab85495cac9..c1ce6bec30b 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/ItemsValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java @@ -1,14 +1,11 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; import org.openapijsonschematools.schemas.StringJsonSchema; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/PropertiesValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java similarity index 94% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/PropertiesValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java index c70c091c6e2..4d66d8315a4 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/PropertiesValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java @@ -1,14 +1,11 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; import org.openapijsonschematools.schemas.StringJsonSchema; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/RequiredValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java similarity index 93% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/RequiredValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java index 0c008805a7c..860bc6ee767 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/RequiredValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java @@ -1,14 +1,11 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; import org.openapijsonschematools.schemas.StringJsonSchema; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/SchemaValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java similarity index 93% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/SchemaValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java index 75bb2023e7c..ef7736aa7fe 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/SchemaValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import org.junit.Assert; import org.junit.Test; @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; -class SomeSchema implements SchemaValidator { +class SomeSchema extends SchemaValidator { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/TypeValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java similarity index 88% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/TypeValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java index 0f4ce8862b2..b496d6ff332 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validators/TypeValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java @@ -1,12 +1,9 @@ -package org.openapijsonschematools.schemas.validators; +package org.openapijsonschematools.schemas.validation; import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 709766beded..96d0a9ec0bf 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -300,7 +300,6 @@ public void processOpts() { List schemaSupportingFiles = new ArrayList<>(); schemaSupportingFiles.add("AnyTypeJsonSchema"); schemaSupportingFiles.add("BooleanJsonSchema"); - schemaSupportingFiles.add("CustomIsoparser"); schemaSupportingFiles.add("DateJsonSchema"); schemaSupportingFiles.add("DateTimeJsonSchema"); schemaSupportingFiles.add("DecimalJsonSchema"); @@ -317,13 +316,10 @@ public void processOpts() { schemaSupportingFiles.add("NotAnyTypeJsonSchema"); schemaSupportingFiles.add("NullJsonSchema"); schemaSupportingFiles.add("NumberJsonSchema"); - schemaSupportingFiles.add("PathToSchemasMap"); schemaSupportingFiles.add("PathToTypeMap"); - schemaSupportingFiles.add("SchemaValidator"); schemaSupportingFiles.add("StringJsonSchema"); schemaSupportingFiles.add("UnsetAnyTypeJsonSchema"); schemaSupportingFiles.add("UuidJsonSchema"); - schemaSupportingFiles.add("ValidationMetadata"); for (String schemaSupportingFile: schemaSupportingFiles) { supportingFiles.add(new SupportingFile( "src/main/java/org/openapitools/schemas/"+schemaSupportingFile+".hbs", @@ -335,14 +331,12 @@ public void processOpts() { schemaTestSupportingFiles.add("AnyTypeSchemaTest"); schemaTestSupportingFiles.add("ArrayTypeSchemaTest"); schemaTestSupportingFiles.add("BooleanSchemaTest"); - schemaTestSupportingFiles.add("CustomIsoparserTest"); schemaTestSupportingFiles.add("ListSchemaTest"); schemaTestSupportingFiles.add("MapSchemaTest"); schemaTestSupportingFiles.add("NullSchemaTest"); schemaTestSupportingFiles.add("NumberSchemaTest"); schemaTestSupportingFiles.add("ObjectTypeSchemaTest"); schemaTestSupportingFiles.add("RefBooleanSchemaTest"); - schemaTestSupportingFiles.add("SchemaValidatorTest"); for (String schemaTestSupportingFile: schemaTestSupportingFiles) { supportingFiles.add(new SupportingFile( "src/test/java/org/openapitools/schemas/"+schemaTestSupportingFile+".hbs", @@ -350,34 +344,40 @@ public void processOpts() { schemaTestSupportingFile + ".java")); } - // keyword validators + // validation List keywordValidatorFiles = new ArrayList<>(); keywordValidatorFiles.add("AdditionalPropertiesValidator"); + keywordValidatorFiles.add("CustomIsoparser"); keywordValidatorFiles.add("FakeValidator"); keywordValidatorFiles.add("FormatValidator"); keywordValidatorFiles.add("ItemsValidator"); keywordValidatorFiles.add("KeywordValidator"); + keywordValidatorFiles.add("PathToSchemasMap"); keywordValidatorFiles.add("PropertiesValidator"); keywordValidatorFiles.add("RequiredValidator"); + keywordValidatorFiles.add("SchemaValidator"); keywordValidatorFiles.add("TypeValidator"); + keywordValidatorFiles.add("ValidationMetadata"); for (String keywordValidatorFile: keywordValidatorFiles) { supportingFiles.add(new SupportingFile( - "src/main/java/org/openapitools/schemas/validators/"+keywordValidatorFile+".hbs", - packagePath() + File.separatorChar + "schemas" + File.separatorChar + "validators", + "src/main/java/org/openapitools/schemas/validation/"+keywordValidatorFile+".hbs", + packagePath() + File.separatorChar + "schemas" + File.separatorChar + "validation", keywordValidatorFile + ".java")); } // tests List keywordValidatorTestFiles = new ArrayList<>(); keywordValidatorTestFiles.add("AdditionalPropertiesValidatorTest"); + keywordValidatorTestFiles.add("CustomIsoparserTest"); keywordValidatorTestFiles.add("FormatValidatorTest"); keywordValidatorTestFiles.add("ItemsValidatorTest"); keywordValidatorTestFiles.add("PropertiesValidatorTest"); keywordValidatorTestFiles.add("RequiredValidatorTest"); keywordValidatorTestFiles.add("TypeValidatorTest"); + keywordValidatorTestFiles.add("SchemaValidatorTest"); for (String keywordValidatorTestFile: keywordValidatorTestFiles) { supportingFiles.add(new SupportingFile( - "src/test/java/org/openapitools/schemas/validators/"+keywordValidatorTestFile+".hbs", - testPackagePath() + File.separatorChar + "schemas" + File.separatorChar + "validators", + "src/test/java/org/openapitools/schemas/validation/"+keywordValidatorTestFile+".hbs", + testPackagePath() + File.separatorChar + "schemas" + File.separatorChar + "validation", keywordValidatorTestFile + ".java")); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs index 39afcbf2a7e..606632694d8 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_anytypeOrMultitype.hbs @@ -1,6 +1,6 @@ -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if componentModule}} /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_boolean.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_boolean.hbs index 7abebe6083a..80b70141089 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_boolean.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_boolean.hbs @@ -1,6 +1,6 @@ -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if componentModule}} /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs index e3c58f1d020..60bf91cadad 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_list.hbs @@ -1,6 +1,6 @@ -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if componentModule}} /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs index 786092d65e5..0ccb872af47 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_map.hbs @@ -1,6 +1,6 @@ -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if componentModule}} /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. 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 index 7abebe6083a..80b70141089 100644 --- 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 @@ -1,6 +1,6 @@ -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if componentModule}} /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_number.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_number.hbs index d5a7f10bd00..83955e15e7f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_number.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_number.hbs @@ -1,6 +1,6 @@ -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if componentModule}} /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_string.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_string.hbs index f39b2b89d82..90198169dea 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_string.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_Schema_string.hbs @@ -1,6 +1,6 @@ -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if componentModule}} /* NOTE: This class is auto generated by OpenAPI JSON Schema Generator. 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 665bfc69621..823ff8e2bba 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 @@ -20,7 +20,7 @@ public class {{../jsonPathPiece.camelCase}} extends {{jsonPathPiece.camelCase}} {{/with}} {{/if}} {{else}} -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { {{#if refInfo.refModule}} {{#with getDeepestRef}} {{> src/main/java/org/openapitools/components/schemas/SchemaClass/_validate includeContainer=true }} @@ -63,7 +63,7 @@ public class {{../jsonPathPiece.camelCase}} extends UuidJsonSchema {} public class {{../jsonPathPiece.camelCase}} extends DecimalJsonSchema {} {{/eq}} {{#eq ../format "binary"}} -public class {{jsonPathPiece.camelCase}} implements JsonSchema { +public class {{jsonPathPiece.camelCase}} extends JsonSchema { // BinarySchema } {{/eq}} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_format.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_format.hbs index 84ae01c4845..ceaa896bf42 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_format.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_format.hbs @@ -1 +1 @@ -static final String format = "{{format}}"; +public static final String format = "{{format}}"; diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_items.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_items.hbs index 4b92f1b5cfc..5a9e62daa1f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_items.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_items.hbs @@ -1,3 +1,3 @@ {{#with items}} -static final Class items = {{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}.class; +public static final Class items = {{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}.class; {{/with}} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_properties.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_properties.hbs index 260d6311d17..cbe641c1a48 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_properties.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_properties.hbs @@ -1,4 +1,4 @@ -static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( +public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( {{#each properties}} {{#if refInfo.refClass}} {{#if refInfo.refModule}} 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 b39cabf7fe9..cfbc89020f1 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 @@ -1,4 +1,4 @@ -static final Set required = new LinkedHashSet<>(Set.of( +public static final Set required = new LinkedHashSet<>(Set.of( {{#each requiredProperties}} "{{{@key.original}}}"{{#unless @last}},{{/unless}} {{/each}} diff --git a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_types.hbs b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_types.hbs index 6bbb8302270..143d04247e0 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_types.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/components/schemas/SchemaClass/_types.hbs @@ -1,5 +1,5 @@ {{#if types}} -static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( {{#each types}} {{#eq this "null"}} Void.class{{#unless @last}},{{/unless}} 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 40a520236d2..13767356591 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 @@ -9,7 +9,7 @@ import java.util.Map; import java.util.UUID; -public class AnyTypeJsonSchema implements JsonSchema { +public class AnyTypeJsonSchema extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeJsonSchema.class, arg, configuration); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs index 581eed4b0d6..eb6a79b713f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class BooleanJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class BooleanJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Boolean.class )); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs index 75012b484e5..9f54c869efb 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class DateJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DateJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); static final String format = "date"; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs index 34cc27c2bb7..d38bc958863 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class DateTimeJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DateTimeJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); static final String format = "date-time"; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs index f07ddf9c801..69b43c2b673 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class DecimalJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DecimalJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); static final String format = "number"; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs index 74ef91b3556..bd7900e0778 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class DoubleJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class DoubleJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Double.class )); static final String format = "double"; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs index 997dca0af90..2527ae04306 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class FloatJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class FloatJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Float.class )); static final String format = "float"; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs index 2accf4c4f78..122a508529c 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class Int32JsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class Int32JsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Float.class )); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs index 46be64f7de3..c07f3b8531d 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class Int64JsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class Int64JsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs index 91cc5920ce8..0c0b0302a32 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class IntJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class IntJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Long.class )); static final String format = "int"; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs index 559e19bb563..931110250c7 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs @@ -2,6 +2,9 @@ package {{{packageName}}}.schemas; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.SchemaValidator; +import {{{packageName}}}.schemas.validation.PathToSchemasMap; +import {{{packageName}}}.schemas.validation.ValidationMetadata; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -17,7 +20,7 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -public interface JsonSchema extends SchemaValidator { +public abstract class JsonSchema extends SchemaValidator { private static Object castToAllowedTypes(Object arg, List pathToItem, PathToTypeMap pathToType) { if (arg == null) { pathToType.put(pathToItem, Void.class); @@ -84,7 +87,7 @@ public interface JsonSchema extends SchemaValidator { if (validationMetadata.validationRanEarlier(cls)) { // todo add deeper validated schemas } else { - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(cls, arg, validationMetadata); + PathToSchemasMap otherPathToSchemas = validate(cls, arg, validationMetadata); pathToSchemasMap.update(otherPathToSchemas); for (LinkedHashMap, Void> schemas: pathToSchemasMap.values()) { Class firstSchema = schemas.entrySet().iterator().next().getKey(); @@ -163,51 +166,51 @@ public interface JsonSchema extends SchemaValidator { return null; } - static Void validate(Class cls, Void arg, SchemaConfiguration configuration) { + protected static Void validate(Class cls, Void arg, SchemaConfiguration configuration) { return (Void) validateObject(cls, arg, configuration); } - static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { + protected static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { return (Boolean) validateObject(cls, arg, configuration); } - static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { + protected static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { return (Integer) validateObject(cls, arg, configuration); } - static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { + protected static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { return (Long) validateObject(cls, arg, configuration); } - static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { + protected static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { return (Float) validateObject(cls, arg, configuration); } - static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { + protected static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { return (Double) validateObject(cls, arg, configuration); } - static String validate(Class cls, String arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, String arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - static T validate(Class cls, Map arg, SchemaConfiguration configuration) { + protected static T validate(Class cls, Map arg, SchemaConfiguration configuration) { return (T) validateObject(cls, arg, configuration); } - static U validate(Class cls, List arg, SchemaConfiguration configuration) { + protected static U validate(Class cls, List arg, SchemaConfiguration configuration) { return (U) validateObject(cls, arg, configuration); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs index 2b3e5f61866..c7cf7cad343 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class ListJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class ListJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenList.class )); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs index 27ffdaa972c..0b3315e5217 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class MapJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class MapJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( FrozenMap.class )); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs index 7a32088c483..2acfe7429e6 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs @@ -11,6 +11,6 @@ import java.util.Set; import java.util.UUID; -public class NotAnyTypeJsonSchema implements JsonSchema { +public class NotAnyTypeJsonSchema extends JsonSchema { // todo add not definition here when that validator is added } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs index 46e02d13411..aa9ff6a1bde 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class NullJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class NullJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Void.class )); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs index 155eded3129..4d61b41d16f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class NumberJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class NumberJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( Integer.class, Long.class, Float.class, 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 c65a45c7da9..2b3997e26f5 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 @@ -11,8 +11,8 @@ import java.util.Set; import java.util.UUID; -public class StringJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class StringJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/UnsetAnyTypeJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/UnsetAnyTypeJsonSchema.hbs index caacd88852d..dfa289b79cb 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/UnsetAnyTypeJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/UnsetAnyTypeJsonSchema.hbs @@ -11,7 +11,7 @@ import java.util.Set; import java.util.UUID; -public class UnsetAnyTypeJsonSchema implements JsonSchema { +public class UnsetAnyTypeJsonSchema extends JsonSchema { static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(UnsetAnyTypeJsonSchema.class, arg, configuration); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs index ab44f4af9f0..b315b377c07 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs @@ -11,11 +11,11 @@ import java.util.Set; import java.util.UUID; -public class UuidJsonSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( +public class UuidJsonSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); - static final String format = "uuid"; + public static final String format = "uuid"; public static String validate(String arg, SchemaConfiguration configuration) { return JsonSchema.validate(UuidJsonSchema.class, arg, configuration); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/AdditionalPropertiesValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/AdditionalPropertiesValidator.hbs similarity index 84% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/validators/AdditionalPropertiesValidator.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/AdditionalPropertiesValidator.hbs index 76034e945b9..fc65d846e9f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/AdditionalPropertiesValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/AdditionalPropertiesValidator.hbs @@ -1,9 +1,6 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; -import {{{packageName}}}.schemas.PathToSchemasMap; import {{{packageName}}}.schemas.JsonSchema; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -14,7 +11,7 @@ import java.util.Set; public class AdditionalPropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/CustomIsoparser.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/CustomIsoparser.hbs similarity index 87% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/CustomIsoparser.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/CustomIsoparser.hbs index c7a6720a43e..ab111822f9f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/CustomIsoparser.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/CustomIsoparser.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import java.time.ZonedDateTime; import java.time.LocalDate; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs new file mode 100644 index 00000000000..321dc9b5396 --- /dev/null +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs @@ -0,0 +1,8 @@ +package org.openapijsonschematools.schemas.validation; + +public class FakeValidator implements KeywordValidator { + @Override + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + return null; + } +} diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/FormatValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FormatValidator.hbs similarity index 94% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/validators/FormatValidator.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FormatValidator.hbs index 1694fc0d647..675f95f70b2 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/FormatValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FormatValidator.hbs @@ -1,9 +1,4 @@ -package {{{packageName}}}.schemas.validators; - -import {{{packageName}}}.schemas.CustomIsoparser; -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; +package {{{packageName}}}.schemas.validation; import java.math.BigDecimal; import java.math.BigInteger; @@ -138,7 +133,7 @@ public class FormatValidator implements KeywordValidator { } @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { String format = (String) constraint; if (arg instanceof Number) { validateNumericFormat( diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/ItemsValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ItemsValidator.hbs similarity index 80% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/validators/ItemsValidator.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ItemsValidator.hbs index f4607d7b7e3..16de36e1a0f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/ItemsValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ItemsValidator.hbs @@ -1,16 +1,13 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; -import {{{packageName}}}.schemas.PathToSchemasMap; import {{{packageName}}}.schemas.JsonSchema; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.List; public class ItemsValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof List)) { return null; } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs new file mode 100644 index 00000000000..aac5ef86ec0 --- /dev/null +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs @@ -0,0 +1,10 @@ +package {{{packageName}}}.schemas.validation; + +public interface KeywordValidator { + PathToSchemasMap validate( + Class cls, + Object arg, + Object constraint, + ValidationMetadata validationMetadata, + Object extra); +} diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/PathToSchemasMap.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToSchemasMap.hbs similarity index 93% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/PathToSchemasMap.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToSchemasMap.hbs index 7aa27723b42..79148f93611 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/PathToSchemasMap.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToSchemasMap.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/PropertiesValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PropertiesValidator.hbs similarity index 82% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/validators/PropertiesValidator.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PropertiesValidator.hbs index 73eda969c6e..2f1c2957226 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/PropertiesValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PropertiesValidator.hbs @@ -1,9 +1,6 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; -import {{{packageName}}}.schemas.PathToSchemasMap; import {{{packageName}}}.schemas.JsonSchema; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -13,7 +10,7 @@ import java.util.Set; public class PropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/RequiredValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/RequiredValidator.hbs similarity index 72% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/validators/RequiredValidator.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/RequiredValidator.hbs index 2aff713169b..e26b25724a4 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/RequiredValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/RequiredValidator.hbs @@ -1,8 +1,4 @@ -package org.openapijsonschematools.schemas.validators; - -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; +package org.openapijsonschematools.schemas.validation; import java.util.HashSet; import java.util.List; @@ -11,7 +7,7 @@ import java.util.Set; public class RequiredValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/SchemaValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs similarity index 50% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/SchemaValidator.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs index e3d4c2c535b..7926268f69c 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/SchemaValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs @@ -1,13 +1,6 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; -import {{{packageName}}}.schemas.validators.AdditionalPropertiesValidator; -import {{{packageName}}}.schemas.validators.FakeValidator; -import {{{packageName}}}.schemas.validators.FormatValidator; -import {{{packageName}}}.schemas.validators.ItemsValidator; -import {{{packageName}}}.schemas.validators.KeywordValidator; -import {{{packageName}}}.schemas.validators.PropertiesValidator; -import {{{packageName}}}.schemas.validators.RequiredValidator; -import {{{packageName}}}.schemas.validators.TypeValidator; +import {{{packageName}}}.schemas.JsonSchema; import java.lang.reflect.Field; import java.util.HashMap; @@ -16,7 +9,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public interface SchemaValidator { +public abstract class SchemaValidator { static HashMap keywordToValidator = new HashMap()\{{ put("allOf", new FakeValidator()); put("anyOf", new FakeValidator()); @@ -60,17 +53,17 @@ public interface SchemaValidator { put("unevaluatedProperties", new FakeValidator()); }}; - static PathToSchemasMap validate( - Class schemaCls, + protected static PathToSchemasMap validate( + Class schemaCls, Object arg, ValidationMetadata validationMetadata ) { HashMap fieldsToValues = new HashMap<>(); LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); - Class usedSchemaCls = schemaCls; - if (schemaCls.getSuperclass() != Object.class) { + Class usedSchemaCls = schemaCls; + if (schemaCls.getSuperclass() != JsonSchema.class) { // only ref with no adjacent properties supported at this time - usedSchemaCls = schemaCls.getSuperclass(); + usedSchemaCls = (Class) schemaCls.getSuperclass(); } Field[] fields = usedSchemaCls.getDeclaredFields(); for (Field field : fields) { @@ -93,7 +86,6 @@ public interface SchemaValidator { } Object extra = null; PathToSchemasMap pathToSchemas = new PathToSchemasMap(); - Class castSchemaCls = (Class) schemaCls; for (Map.Entry entry: fieldsToValues.entrySet()) { String jsonKeyword = entry.getKey(); Object constraint = entry.getValue(); @@ -102,7 +94,7 @@ public interface SchemaValidator { } KeywordValidator validatorClass = keywordToValidator.get(jsonKeyword); PathToSchemasMap otherPathToSchemas = validatorClass.validate( - castSchemaCls, + schemaCls, arg, constraint, validationMetadata, @@ -129,88 +121,3 @@ public interface SchemaValidator { return pathToSchemas; } } -/** - * @classmethod - * def _validate( - * cls, - * arg, - * validation_metadata: ValidationMetadata, - * ) -> PathToSchemasType: - * """ - * SchemaValidator validate - * All keyword validation except for type checking was done in calling stack frames - * If those validations passed, the validated classes are collected in path_to_schemas - * """ - * cls_schema = cls() - * json_schema_data = { - * k: v - * for k, v in vars(cls_schema).items() - * if k not in cls.__excluded_cls_properties - * and k - * not in validation_metadata.configuration.disabled_json_schema_python_keywords - * } - * contains_path_to_schemas = [] - * path_to_schemas: PathToSchemasType = {} - * if 'contains' in vars(cls_schema): - * contains_path_to_schemas = _get_contains_path_to_schemas( - * arg, - * vars(cls_schema)['contains'], - * validation_metadata, - * path_to_schemas - * ) - * if_path_to_schemas = None - * if 'if_' in vars(cls_schema): - * if_path_to_schemas = _get_if_path_to_schemas( - * arg, - * vars(cls_schema)['if_'], - * validation_metadata, - * ) - * validated_pattern_properties: typing.Optional[PathToSchemasType] = None - * if 'pattern_properties' in vars(cls_schema): - * validated_pattern_properties = _get_validated_pattern_properties( - * arg, - * vars(cls_schema)['pattern_properties'], - * cls, - * validation_metadata - * ) - * prefix_items_length = 0 - * if 'prefix_items' in vars(cls_schema): - * prefix_items_length = len(vars(cls_schema)['prefix_items']) - * for keyword, val in json_schema_data.items(): - * used_val: typing.Any - * if keyword in {'contains', 'min_contains', 'max_contains'}: - * used_val = (val, contains_path_to_schemas) - * elif keyword == 'items': - * used_val = (val, prefix_items_length) - * elif keyword in {'unevaluated_items', 'unevaluated_properties'}: - * used_val = (val, path_to_schemas) - * elif keyword in {'types'}: - * format: typing.Optional[str] = vars(cls_schema).get('format', None) - * used_val = (val, format) - * elif keyword in {'pattern_properties', 'additional_properties'}: - * used_val = (val, validated_pattern_properties) - * elif keyword in {'if_', 'then', 'else_'}: - * used_val = (val, if_path_to_schemas) - * else: - * used_val = val - * validator = json_schema_keyword_to_validator[keyword] - * - * other_path_to_schemas = validator( - * arg, - * used_val, - * cls, - * validation_metadata, - * {{#if nonCompliantUseDiscriminatorIfCompositionFails}} - * **kwargs - * {{/if}} - * ) - * if other_path_to_schemas: - * update(path_to_schemas, other_path_to_schemas) - * - * base_class = type(arg) - * if validation_metadata.path_to_item not in path_to_schemas: - * path_to_schemas[validation_metadata.path_to_item] = dict() - * path_to_schemas[validation_metadata.path_to_item][base_class] = None - * path_to_schemas[validation_metadata.path_to_item][cls] = None - * return path_to_schemas - */ diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/TypeValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/TypeValidator.hbs similarity index 56% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/validators/TypeValidator.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/TypeValidator.hbs index 7102a33a6ab..c4b80b06318 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/TypeValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/TypeValidator.hbs @@ -1,14 +1,10 @@ -package {{{packageName}}}.schemas.validators; - -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; +package {{{packageName}}}.schemas.validation; import java.util.HashSet; public class TypeValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { HashSet> types = (HashSet>) constraint; Class argClass; if (arg == null) { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/ValidationMetadata.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ValidationMetadata.hbs similarity index 93% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/ValidationMetadata.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ValidationMetadata.hbs index 93209ca2483..e5499f29ec2 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/ValidationMetadata.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ValidationMetadata.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import {{{packageName}}}.configurations.SchemaConfiguration; import java.util.List; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/FakeValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/FakeValidator.hbs deleted file mode 100644 index c0010c0d90f..00000000000 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/FakeValidator.hbs +++ /dev/null @@ -1,12 +0,0 @@ -package org.openapijsonschematools.schemas.validators; - -import org.openapijsonschematools.schemas.PathToSchemasMap; -import org.openapijsonschematools.schemas.SchemaValidator; -import org.openapijsonschematools.schemas.ValidationMetadata; - -public class FakeValidator implements KeywordValidator { - @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { - return null; - } -} diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/KeywordValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/KeywordValidator.hbs deleted file mode 100644 index 09a4c40c957..00000000000 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validators/KeywordValidator.hbs +++ /dev/null @@ -1,14 +0,0 @@ -package {{{packageName}}}.schemas.validators; - -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; - -public interface KeywordValidator { - PathToSchemasMap validate( - Class cls, - Object arg, - Object constraint, - ValidationMetadata validationMetadata, - Object extra); -} diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs index 8c14ab5019a..65ed4044e6d 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs @@ -10,44 +10,45 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -class ArrayWithItemsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenList.class - )); - static final Class items = StringJsonSchema.class; - - public static FrozenList validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ArrayWithItemsSchema.class, arg, configuration); - } -} -class ArrayWithOutputClsSchemaList extends FrozenList { - ArrayWithOutputClsSchemaList(FrozenList m) { - super(m); - } +public class ArrayTypeSchemaTest { + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + + public class ArrayWithItemsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenList.class + )); + public static final Class items = StringJsonSchema.class; - public static ArrayWithOutputClsSchemaList of(List arg, SchemaConfiguration configuration) { - return ArrayWithOutputClsSchema.validate(arg, configuration); + public static FrozenList validate(List arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ArrayWithItemsSchema.class, arg, configuration); + } } -} -class ArrayWithOutputClsSchema implements JsonSchema { - static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenList.class - )); - static final Class items = StringJsonSchema.class; + public static class ArrayWithOutputClsSchemaList extends FrozenList { + ArrayWithOutputClsSchemaList(FrozenList m) { + super(m); + } - protected static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { - return new ArrayWithOutputClsSchemaList(arg); + public static ArrayWithOutputClsSchemaList of(List arg, SchemaConfiguration configuration) { + return ArrayWithOutputClsSchema.validate(arg, configuration); + } } - public static ArrayWithOutputClsSchemaList validate(List arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ArrayWithOutputClsSchema.class, arg, configuration); - } -} + public class ArrayWithOutputClsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenList.class + )); + public static final Class items = StringJsonSchema.class; -public class ArrayTypeSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + protected static ArrayWithOutputClsSchemaList getListOutputInstance(FrozenList arg) { + return new ArrayWithOutputClsSchemaList(arg); + } + + public static ArrayWithOutputClsSchemaList validate(List arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ArrayWithOutputClsSchema.class, arg, configuration); + } + } @Test public void testExceptionThrownForInvalidType() { diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs index da40cb4a79b..28fca714612 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs @@ -11,74 +11,75 @@ import java.util.AbstractMap; import java.util.Map; import java.util.Set; -class ObjectWithPropsSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) - )); - - public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithPropsSchema.class, arg, configuration); - } -} -class ObjectWithAddpropsSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final Class additionalProperties = StringJsonSchema.class; +public class ObjectTypeSchemaTest { + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + + public class ObjectWithPropsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) + )); - public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithAddpropsSchema.class, arg, configuration); + public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithPropsSchema.class, arg, configuration); + } } -} -class ObjectWithPropsAndAddpropsSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) - )); - public static final Class additionalProperties = BooleanJsonSchema.class; - - public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithPropsAndAddpropsSchema.class, arg, configuration); + public class ObjectWithAddpropsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final Class additionalProperties = StringJsonSchema.class; + + public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithAddpropsSchema.class, arg, configuration); + } } -} -class ObjectWithOutputTypeSchemaMap extends FrozenMap { - ObjectWithOutputTypeSchemaMap(FrozenMap m) { - super(m); + public class ObjectWithPropsAndAddpropsSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) + )); + public static final Class additionalProperties = BooleanJsonSchema.class; + + public static FrozenMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithPropsAndAddpropsSchema.class, arg, configuration); + } } - public static ObjectWithOutputTypeSchemaMap of(Map arg, SchemaConfiguration configuration) { - return ObjectWithOutputTypeSchema.validate(arg, configuration); + public static class ObjectWithOutputTypeSchemaMap extends FrozenMap { + ObjectWithOutputTypeSchemaMap(FrozenMap m) { + super(m); + } + + public static ObjectWithOutputTypeSchemaMap of(Map arg, SchemaConfiguration configuration) { + return ObjectWithOutputTypeSchema.validate(arg, configuration); + } } -} -class ObjectWithOutputTypeSchema implements JsonSchema { - public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( - FrozenMap.class - )); - public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) - )); + public class ObjectWithOutputTypeSchema extends JsonSchema { + public static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( + FrozenMap.class + )); + public static final LinkedHashMap> properties = new LinkedHashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry>("someString", StringJsonSchema.class) + )); - static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { - return new ObjectWithOutputTypeSchemaMap(arg); - } + protected static ObjectWithOutputTypeSchemaMap getMapOutputInstance(FrozenMap arg) { + return new ObjectWithOutputTypeSchemaMap(arg); + } - public static ObjectWithOutputTypeSchemaMap validate(Map arg, SchemaConfiguration configuration) { - return JsonSchema.validate(ObjectWithOutputTypeSchema.class, arg, configuration); + public static ObjectWithOutputTypeSchemaMap validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate(ObjectWithOutputTypeSchema.class, arg, configuration); + } } -} - -public class ObjectTypeSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); @Test public void testExceptionThrownForInvalidType() { diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/AdditionalPropertiesValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/AdditionalPropertiesValidatorTest.hbs similarity index 95% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/validators/AdditionalPropertiesValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/AdditionalPropertiesValidatorTest.hbs index 1c1c49b433f..2b96c164cc3 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/AdditionalPropertiesValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/AdditionalPropertiesValidatorTest.hbs @@ -1,14 +1,11 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; import {{{packageName}}}.schemas.FrozenMap; -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; import {{{packageName}}}.schemas.StringJsonSchema; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/CustomIsoparserTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/CustomIsoparserTest.hbs similarity index 94% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/CustomIsoparserTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/CustomIsoparserTest.hbs index 9acb2375bf9..ed5b89f25de 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/CustomIsoparserTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/CustomIsoparserTest.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import java.time.LocalDate; import java.time.ZonedDateTime; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/FormatValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/FormatValidatorTest.hbs similarity index 98% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/validators/FormatValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/FormatValidatorTest.hbs index c6a7a9430b9..cbc9a30cd03 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/FormatValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/FormatValidatorTest.hbs @@ -1,12 +1,9 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/ItemsValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/ItemsValidatorTest.hbs similarity index 94% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/validators/ItemsValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/ItemsValidatorTest.hbs index 93689b20cb2..f31afbe7cc1 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/ItemsValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/ItemsValidatorTest.hbs @@ -1,14 +1,11 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; import {{{packageName}}}.schemas.FrozenList; -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; import {{{packageName}}}.schemas.StringJsonSchema; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/PropertiesValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/PropertiesValidatorTest.hbs similarity index 95% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/validators/PropertiesValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/PropertiesValidatorTest.hbs index 2f28cb66eac..c08046178b2 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/PropertiesValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/PropertiesValidatorTest.hbs @@ -1,14 +1,11 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; import {{{packageName}}}.schemas.FrozenMap; -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; import {{{packageName}}}.schemas.StringJsonSchema; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/RequiredValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/RequiredValidatorTest.hbs similarity index 94% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/validators/RequiredValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/RequiredValidatorTest.hbs index 3bf20328420..1ad4f0cae5b 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/RequiredValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/RequiredValidatorTest.hbs @@ -1,14 +1,11 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; import {{{packageName}}}.schemas.FrozenMap; -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; import {{{packageName}}}.schemas.StringJsonSchema; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/SchemaValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/SchemaValidatorTest.hbs similarity index 94% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/SchemaValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/SchemaValidatorTest.hbs index d51fe0642cb..c6b6eb2bf3e 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/SchemaValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/SchemaValidatorTest.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import org.junit.Assert; import org.junit.Test; @@ -11,7 +11,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -class SomeSchema implements SchemaValidator { +class SomeSchema extends SchemaValidator { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/TypeValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/TypeValidatorTest.hbs similarity index 89% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/validators/TypeValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/TypeValidatorTest.hbs index c63d089a91f..555afad4155 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validators/TypeValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/TypeValidatorTest.hbs @@ -1,12 +1,9 @@ -package {{{packageName}}}.schemas.validators; +package {{{packageName}}}.schemas.validation; import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.schemas.PathToSchemasMap; -import {{{packageName}}}.schemas.SchemaValidator; -import {{{packageName}}}.schemas.ValidationMetadata; import java.util.ArrayList; import java.util.LinkedHashSet; From e04e41f84ecd49dfc0c73fc0e31469bdd31c94ab Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 19 Nov 2023 16:32:59 -0800 Subject: [PATCH 09/15] FIxes java warning in schema validator --- .../schemas/validation/SchemaValidator.java | 90 ++++++++++--------- .../schemas/validation/SchemaValidator.hbs | 90 ++++++++++--------- 2 files changed, 92 insertions(+), 88 deletions(-) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java index dc804f1b661..161874d1953 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java @@ -3,6 +3,7 @@ import org.openapijsonschematools.schemas.JsonSchema; import java.lang.reflect.Field; +import java.util.AbstractMap; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.LinkedHashMap; @@ -10,48 +11,48 @@ import java.util.Map; public abstract class SchemaValidator { - static HashMap keywordToValidator = new HashMap(){{ - put("allOf", new FakeValidator()); - put("anyOf", new FakeValidator()); - put("const", new FakeValidator()); - put("contains", new FakeValidator()); - put("default", new FakeValidator()); - put("dependentRequired", new FakeValidator()); - put("dependentSchemas", new FakeValidator()); - put("discriminator", new FakeValidator()); - put("enumInfo", new FakeValidator()); - put("exclusiveMinimum", new FakeValidator()); - put("exclusiveMinimum", new FakeValidator()); - put("format", new FormatValidator()); - put("if_", new FakeValidator()); - put("then", new FakeValidator()); - put("else_", new FakeValidator()); - put("maxContains", new FakeValidator()); - put("maxItems", new FakeValidator()); - put("maxLength", new FakeValidator()); - put("maxProperties", new FakeValidator()); - put("maximum", new FakeValidator()); - put("minContains", new FakeValidator()); - put("minItems", new FakeValidator()); - put("minLength", new FakeValidator()); - put("minProperties", new FakeValidator()); - put("minimum", new FakeValidator()); - put("multipleOf", new FakeValidator()); - put("not", new FakeValidator()); - put("oneOf", new FakeValidator()); - put("pattern", new FakeValidator()); - put("patternProperties", new FakeValidator()); - put("prefixItems", new FakeValidator()); - put("required", new RequiredValidator()); - put("type", new TypeValidator()); - put("uniqueItems", new FakeValidator()); - put("items", new ItemsValidator()); - put("unevaluatedItems", new FakeValidator()); - put("properties", new PropertiesValidator()); - put("propertyNames", new FakeValidator()); - put("additionalProperties", new AdditionalPropertiesValidator()); - put("unevaluatedProperties", new FakeValidator()); - }}; + static HashMap keywordToValidator = new HashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry("allOf", new FakeValidator()), + new AbstractMap.SimpleEntry("anyOf", new FakeValidator()), + new AbstractMap.SimpleEntry("const", new FakeValidator()), + new AbstractMap.SimpleEntry("contains", new FakeValidator()), + new AbstractMap.SimpleEntry("default", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentRequired", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentSchemas", new FakeValidator()), + new AbstractMap.SimpleEntry("discriminator", new FakeValidator()), + new AbstractMap.SimpleEntry("enumInfo", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMaximum", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMinimum", new FakeValidator()), + new AbstractMap.SimpleEntry("format", new FormatValidator()), + new AbstractMap.SimpleEntry("if_", new FakeValidator()), + new AbstractMap.SimpleEntry("then", new FakeValidator()), + new AbstractMap.SimpleEntry("else_", new FakeValidator()), + new AbstractMap.SimpleEntry("maxContains", new FakeValidator()), + new AbstractMap.SimpleEntry("maxItems", new FakeValidator()), + new AbstractMap.SimpleEntry("maxLength", new FakeValidator()), + new AbstractMap.SimpleEntry("maxProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("maximum", new FakeValidator()), + new AbstractMap.SimpleEntry("minContains", new FakeValidator()), + new AbstractMap.SimpleEntry("minItems", new FakeValidator()), + new AbstractMap.SimpleEntry("minLength", new FakeValidator()), + new AbstractMap.SimpleEntry("minProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("minimum", new FakeValidator()), + new AbstractMap.SimpleEntry("multipleOf", new FakeValidator()), + new AbstractMap.SimpleEntry("not", new FakeValidator()), + new AbstractMap.SimpleEntry("oneOf", new FakeValidator()), + new AbstractMap.SimpleEntry("pattern", new FakeValidator()), + new AbstractMap.SimpleEntry("patternProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("prefixItems", new FakeValidator()), + new AbstractMap.SimpleEntry("required", new RequiredValidator()), + new AbstractMap.SimpleEntry("type", new TypeValidator()), + new AbstractMap.SimpleEntry("uniqueItems", new FakeValidator()), + new AbstractMap.SimpleEntry("items", new ItemsValidator()), + new AbstractMap.SimpleEntry("unevaluatedItems", new FakeValidator()), + new AbstractMap.SimpleEntry("properties", new PropertiesValidator()), + new AbstractMap.SimpleEntry("propertyNames", new FakeValidator()), + new AbstractMap.SimpleEntry("additionalProperties", new AdditionalPropertiesValidator()), + new AbstractMap.SimpleEntry("unevaluatedProperties", new FakeValidator()) + )); protected static PathToSchemasMap validate( Class schemaCls, @@ -61,9 +62,10 @@ protected static PathToSchemasMap validate( HashMap fieldsToValues = new HashMap<>(); LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); Class usedSchemaCls = schemaCls; - if (schemaCls.getSuperclass() != JsonSchema.class) { + Class superclass = schemaCls.getSuperclass(); + if (superclass != JsonSchema.class) { // only ref with no adjacent properties supported at this time - usedSchemaCls = (Class) schemaCls.getSuperclass(); + usedSchemaCls = (Class) superclass; } Field[] fields = usedSchemaCls.getDeclaredFields(); for (Field field : fields) { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs index 7926268f69c..bf70f8e87fe 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs @@ -3,6 +3,7 @@ package {{{packageName}}}.schemas.validation; import {{{packageName}}}.schemas.JsonSchema; import java.lang.reflect.Field; +import java.util.AbstractMap; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.LinkedHashMap; @@ -10,48 +11,48 @@ import java.util.List; import java.util.Map; public abstract class SchemaValidator { - static HashMap keywordToValidator = new HashMap()\{{ - put("allOf", new FakeValidator()); - put("anyOf", new FakeValidator()); - put("const", new FakeValidator()); - put("contains", new FakeValidator()); - put("default", new FakeValidator()); - put("dependentRequired", new FakeValidator()); - put("dependentSchemas", new FakeValidator()); - put("discriminator", new FakeValidator()); - put("enumInfo", new FakeValidator()); - put("exclusiveMinimum", new FakeValidator()); - put("exclusiveMinimum", new FakeValidator()); - put("format", new FormatValidator()); - put("if_", new FakeValidator()); - put("then", new FakeValidator()); - put("else_", new FakeValidator()); - put("maxContains", new FakeValidator()); - put("maxItems", new FakeValidator()); - put("maxLength", new FakeValidator()); - put("maxProperties", new FakeValidator()); - put("maximum", new FakeValidator()); - put("minContains", new FakeValidator()); - put("minItems", new FakeValidator()); - put("minLength", new FakeValidator()); - put("minProperties", new FakeValidator()); - put("minimum", new FakeValidator()); - put("multipleOf", new FakeValidator()); - put("not", new FakeValidator()); - put("oneOf", new FakeValidator()); - put("pattern", new FakeValidator()); - put("patternProperties", new FakeValidator()); - put("prefixItems", new FakeValidator()); - put("required", new RequiredValidator()); - put("type", new TypeValidator()); - put("uniqueItems", new FakeValidator()); - put("items", new ItemsValidator()); - put("unevaluatedItems", new FakeValidator()); - put("properties", new PropertiesValidator()); - put("propertyNames", new FakeValidator()); - put("additionalProperties", new AdditionalPropertiesValidator()); - put("unevaluatedProperties", new FakeValidator()); - }}; + static HashMap keywordToValidator = new HashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry("allOf", new FakeValidator()), + new AbstractMap.SimpleEntry("anyOf", new FakeValidator()), + new AbstractMap.SimpleEntry("const", new FakeValidator()), + new AbstractMap.SimpleEntry("contains", new FakeValidator()), + new AbstractMap.SimpleEntry("default", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentRequired", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentSchemas", new FakeValidator()), + new AbstractMap.SimpleEntry("discriminator", new FakeValidator()), + new AbstractMap.SimpleEntry("enumInfo", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMaximum", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMinimum", new FakeValidator()), + new AbstractMap.SimpleEntry("format", new FormatValidator()), + new AbstractMap.SimpleEntry("if_", new FakeValidator()), + new AbstractMap.SimpleEntry("then", new FakeValidator()), + new AbstractMap.SimpleEntry("else_", new FakeValidator()), + new AbstractMap.SimpleEntry("maxContains", new FakeValidator()), + new AbstractMap.SimpleEntry("maxItems", new FakeValidator()), + new AbstractMap.SimpleEntry("maxLength", new FakeValidator()), + new AbstractMap.SimpleEntry("maxProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("maximum", new FakeValidator()), + new AbstractMap.SimpleEntry("minContains", new FakeValidator()), + new AbstractMap.SimpleEntry("minItems", new FakeValidator()), + new AbstractMap.SimpleEntry("minLength", new FakeValidator()), + new AbstractMap.SimpleEntry("minProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("minimum", new FakeValidator()), + new AbstractMap.SimpleEntry("multipleOf", new FakeValidator()), + new AbstractMap.SimpleEntry("not", new FakeValidator()), + new AbstractMap.SimpleEntry("oneOf", new FakeValidator()), + new AbstractMap.SimpleEntry("pattern", new FakeValidator()), + new AbstractMap.SimpleEntry("patternProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("prefixItems", new FakeValidator()), + new AbstractMap.SimpleEntry("required", new RequiredValidator()), + new AbstractMap.SimpleEntry("type", new TypeValidator()), + new AbstractMap.SimpleEntry("uniqueItems", new FakeValidator()), + new AbstractMap.SimpleEntry("items", new ItemsValidator()), + new AbstractMap.SimpleEntry("unevaluatedItems", new FakeValidator()), + new AbstractMap.SimpleEntry("properties", new PropertiesValidator()), + new AbstractMap.SimpleEntry("propertyNames", new FakeValidator()), + new AbstractMap.SimpleEntry("additionalProperties", new AdditionalPropertiesValidator()), + new AbstractMap.SimpleEntry("unevaluatedProperties", new FakeValidator()) + )); protected static PathToSchemasMap validate( Class schemaCls, @@ -61,9 +62,10 @@ public abstract class SchemaValidator { HashMap fieldsToValues = new HashMap<>(); LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); Class usedSchemaCls = schemaCls; - if (schemaCls.getSuperclass() != JsonSchema.class) { + Class superclass = schemaCls.getSuperclass(); + if (superclass != JsonSchema.class) { // only ref with no adjacent properties supported at this time - usedSchemaCls = (Class) schemaCls.getSuperclass(); + usedSchemaCls = (Class) superclass; } Field[] fields = usedSchemaCls.getDeclaredFields(); for (Field field : fields) { From 13c7beb1b020631801c979ebd3833600d0b9f12e Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 19 Nov 2023 17:05:23 -0800 Subject: [PATCH 10/15] Fixes some java warnings in JsonSchema class --- .../schemas/JsonSchema.java | 58 +++++++++---------- .../org/openapitools/schemas/JsonSchema.hbs | 58 +++++++++---------- 2 files changed, 52 insertions(+), 64 deletions(-) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java index 8d9c63e964e..a4a5e853aad 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java @@ -82,7 +82,7 @@ private static Object castToAllowedTypes(Object arg, List pathToItem, Pa } } - private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, PathToTypeMap pathToType) { + private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, PathToTypeMap pathToType) { PathToSchemasMap pathToSchemasMap = new PathToSchemasMap(); if (validationMetadata.validationRanEarlier(cls)) { // todo add deeper validated schemas @@ -107,11 +107,10 @@ private static PathToSchemasMap getPathToSchemas(Class cls, Object a return pathToSchemasMap; } - private static FrozenMap getProperties(Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { + private static FrozenMap getProperties(Map arg, List pathToItem, PathToSchemasMap pathToSchemas) { LinkedHashMap properties = new LinkedHashMap<>(); - Map castArg = (Map) arg; - for(Map.Entry entry: castArg.entrySet()) { - String propertyName = entry.getKey(); + for(Map.Entry entry: arg.entrySet()) { + String propertyName = (String) entry.getKey(); List propertyPathToItem = new ArrayList<>(pathToItem); propertyPathToItem.add(propertyName); Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); @@ -122,11 +121,10 @@ private static FrozenMap getProperties(Object arg, List return new FrozenMap<>(properties); } - private static FrozenList getItems(Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { + private static FrozenList getItems(List arg, List pathToItem, PathToSchemasMap pathToSchemas) { ArrayList items = new ArrayList<>(); - List castItems = (List) arg; int i = 0; - for (Object item: castItems) { + for (Object item: arg) { List itemPathToItem = new ArrayList<>(pathToItem); itemPathToItem.add(i); Class itemClass = (Class) pathToSchemas.get(itemPathToItem).entrySet().iterator().next().getKey(); @@ -137,13 +135,9 @@ private static FrozenList getItems(Object arg, List pathToItem, return new FrozenList<>(items); } - private static Object getNewInstance(Class cls, Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { - if (!(arg instanceof Map || arg instanceof List)) { - // str, int, float, boolean, null, FileIO, bytes - return arg; - } + private static Object getNewInstance(Class cls, Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { if (arg instanceof Map) { - FrozenMap usedArg = getProperties(arg, pathToItem, pathToSchemas); + FrozenMap usedArg = getProperties((Map) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getMapOutputInstance", FrozenMap.class); return method.invoke(null, usedArg); @@ -153,7 +147,7 @@ private static Object getNewInstance(Class cls, Object arg, List usedArg = getItems(arg, pathToItem, pathToSchemas); + FrozenList usedArg = getItems((List) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getListOutputInstance", FrozenList.class); return method.invoke(null, usedArg); @@ -163,61 +157,61 @@ private static Object getNewInstance(Class cls, Object arg, List cls, Void arg, SchemaConfiguration configuration) { + protected static Void validate(Class cls, Void arg, SchemaConfiguration configuration) { return (Void) validateObject(cls, arg, configuration); } - protected static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { + protected static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { return (Boolean) validateObject(cls, arg, configuration); } - protected static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { + protected static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { return (Integer) validateObject(cls, arg, configuration); } - protected static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { + protected static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { return (Long) validateObject(cls, arg, configuration); } - protected static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { + protected static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { return (Float) validateObject(cls, arg, configuration); } - protected static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { + protected static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { return (Double) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, String arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, String arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static T validate(Class cls, Map arg, SchemaConfiguration configuration) { + protected static T validate(Class cls, Map arg, SchemaConfiguration configuration) { return (T) validateObject(cls, arg, configuration); } - protected static U validate(Class cls, List arg, SchemaConfiguration configuration) { + protected static U validate(Class cls, List arg, SchemaConfiguration configuration) { return (U) validateObject(cls, arg, configuration); } // todo add bytes and FileIO - private static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { - Class castCls = (Class) cls; + private static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { if (arg instanceof Map || arg instanceof List) { // todo don't run validation if the instance is one of the class generic types } @@ -233,8 +227,8 @@ private static Object validateObject(Class cls, Object arg, SchemaConfigurati validatedPathToSchemas, new LinkedHashSet<>() ); - PathToSchemasMap pathToSchemasMap = getPathToSchemas(castCls, castArg, validationMetadata, pathToType); - return getNewInstance(castCls, castArg, validationMetadata.pathToItem(), pathToSchemasMap); + PathToSchemasMap pathToSchemasMap = getPathToSchemas(cls, castArg, validationMetadata, pathToType); + return getNewInstance(cls, castArg, validationMetadata.pathToItem(), pathToSchemasMap); } } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs index 931110250c7..2fb3b77e32d 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs @@ -82,7 +82,7 @@ public abstract class JsonSchema extends SchemaValidator { } } - private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, PathToTypeMap pathToType) { + private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, PathToTypeMap pathToType) { PathToSchemasMap pathToSchemasMap = new PathToSchemasMap(); if (validationMetadata.validationRanEarlier(cls)) { // todo add deeper validated schemas @@ -107,11 +107,10 @@ public abstract class JsonSchema extends SchemaValidator { return pathToSchemasMap; } - private static FrozenMap getProperties(Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { + private static FrozenMap getProperties(Map arg, List pathToItem, PathToSchemasMap pathToSchemas) { LinkedHashMap properties = new LinkedHashMap<>(); - Map castArg = (Map) arg; - for(Map.Entry entry: castArg.entrySet()) { - String propertyName = entry.getKey(); + for(Map.Entry entry: arg.entrySet()) { + String propertyName = (String) entry.getKey(); List propertyPathToItem = new ArrayList<>(pathToItem); propertyPathToItem.add(propertyName); Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); @@ -122,11 +121,10 @@ public abstract class JsonSchema extends SchemaValidator { return new FrozenMap<>(properties); } - private static FrozenList getItems(Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { + private static FrozenList getItems(List arg, List pathToItem, PathToSchemasMap pathToSchemas) { ArrayList items = new ArrayList<>(); - List castItems = (List) arg; int i = 0; - for (Object item: castItems) { + for (Object item: arg) { List itemPathToItem = new ArrayList<>(pathToItem); itemPathToItem.add(i); Class itemClass = (Class) pathToSchemas.get(itemPathToItem).entrySet().iterator().next().getKey(); @@ -137,13 +135,9 @@ public abstract class JsonSchema extends SchemaValidator { return new FrozenList<>(items); } - private static Object getNewInstance(Class cls, Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { - if (!(arg instanceof Map || arg instanceof List)) { - // str, int, float, boolean, null, FileIO, bytes - return arg; - } + private static Object getNewInstance(Class cls, Object arg, List pathToItem, PathToSchemasMap pathToSchemas) { if (arg instanceof Map) { - FrozenMap usedArg = getProperties(arg, pathToItem, pathToSchemas); + FrozenMap usedArg = getProperties((Map) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getMapOutputInstance", FrozenMap.class); return method.invoke(null, usedArg); @@ -153,7 +147,7 @@ public abstract class JsonSchema extends SchemaValidator { throw new RuntimeException(e); } } else if (arg instanceof List) { - FrozenList usedArg = getItems(arg, pathToItem, pathToSchemas); + FrozenList usedArg = getItems((List) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getListOutputInstance", FrozenList.class); return method.invoke(null, usedArg); @@ -163,61 +157,61 @@ public abstract class JsonSchema extends SchemaValidator { throw new RuntimeException(e); } } - return null; + // str, int, float, boolean, null, FileIO, bytes + return arg; } - protected static Void validate(Class cls, Void arg, SchemaConfiguration configuration) { + protected static Void validate(Class cls, Void arg, SchemaConfiguration configuration) { return (Void) validateObject(cls, arg, configuration); } - protected static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { + protected static Boolean validate(Class cls, Boolean arg, SchemaConfiguration configuration) { return (Boolean) validateObject(cls, arg, configuration); } - protected static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { + protected static Integer validate(Class cls, Integer arg, SchemaConfiguration configuration) { return (Integer) validateObject(cls, arg, configuration); } - protected static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { + protected static Long validate(Class cls, Long arg, SchemaConfiguration configuration) { return (Long) validateObject(cls, arg, configuration); } - protected static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { + protected static Float validate(Class cls, Float arg, SchemaConfiguration configuration) { return (Float) validateObject(cls, arg, configuration); } - protected static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { + protected static Double validate(Class cls, Double arg, SchemaConfiguration configuration) { return (Double) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, String arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, String arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, ZonedDateTime arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, LocalDate arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { + protected static String validate(Class cls, UUID arg, SchemaConfiguration configuration) { return (String) validateObject(cls, arg, configuration); } - protected static T validate(Class cls, Map arg, SchemaConfiguration configuration) { + protected static T validate(Class cls, Map arg, SchemaConfiguration configuration) { return (T) validateObject(cls, arg, configuration); } - protected static U validate(Class cls, List arg, SchemaConfiguration configuration) { + protected static U validate(Class cls, List arg, SchemaConfiguration configuration) { return (U) validateObject(cls, arg, configuration); } // todo add bytes and FileIO - private static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { - Class castCls = (Class) cls; + private static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { if (arg instanceof Map || arg instanceof List) { // todo don't run validation if the instance is one of the class generic types } @@ -233,8 +227,8 @@ public abstract class JsonSchema extends SchemaValidator { validatedPathToSchemas, new LinkedHashSet<>() ); - PathToSchemasMap pathToSchemasMap = getPathToSchemas(castCls, castArg, validationMetadata, pathToType); - return getNewInstance(castCls, castArg, validationMetadata.pathToItem(), pathToSchemasMap); + PathToSchemasMap pathToSchemasMap = getPathToSchemas(cls, castArg, validationMetadata, pathToType); + return getNewInstance(cls, castArg, validationMetadata.pathToItem(), pathToSchemasMap); } } \ No newline at end of file From 107696978f44aa8aae7ece5e3ea414db8ccb79c3 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 19 Nov 2023 21:31:57 -0800 Subject: [PATCH 11/15] Fixes getProperties input --- .../java/org/openapijsonschematools/schemas/JsonSchema.java | 2 +- .../java/src/main/java/org/openapitools/schemas/JsonSchema.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java index a4a5e853aad..f5a871792ff 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java @@ -113,7 +113,7 @@ private static FrozenMap getProperties(Map arg, List propertyPathToItem = new ArrayList<>(pathToItem); propertyPathToItem.add(propertyName); - Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); + Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); Object value = entry.getValue(); Object castValue = getNewInstance(propertyClass, value, propertyPathToItem, pathToSchemas); properties.put(propertyName, castValue); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs index 2fb3b77e32d..177e1699767 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs @@ -113,7 +113,7 @@ public abstract class JsonSchema extends SchemaValidator { String propertyName = (String) entry.getKey(); List propertyPathToItem = new ArrayList<>(pathToItem); propertyPathToItem.add(propertyName); - Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); + Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); Object value = entry.getValue(); Object castValue = getNewInstance(propertyClass, value, propertyPathToItem, pathToSchemas); properties.put(propertyName, castValue); From 10658f4fe1cabd919c85de45e294a60b9833be1a Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 20 Nov 2023 13:17:11 -0800 Subject: [PATCH 12/15] More refactoring of validation package to reduce java warnings --- .../petstore/java/.openapi-generator/FILES | 13 +- .../content/applicationjson/Schema.java | 4 +- .../responses/headerswithnobody/Headers.java | 4 +- .../content/applicationjson/Schema.java | 4 +- .../content/applicationxml/Schema.java | 4 +- .../Headers.java | 4 +- .../content/applicationjson/Schema.java | 4 +- .../successwithjsonapiresponse/Headers.java | 4 +- .../schemas/AbstractStepMessage.java | 4 +- .../schemas/AdditionalPropertiesClass.java | 4 +- .../AdditionalPropertiesValidator.java | 6 +- .../AdditionalPropertiesWithArrayOfEnums.java | 6 +- .../components/schemas/Address.java | 4 +- .../components/schemas/Animal.java | 4 +- .../components/schemas/AnimalFarm.java | 4 +- .../components/schemas/AnyTypeAndFormat.java | 6 +- .../components/schemas/AnyTypeNotString.java | 6 +- .../components/schemas/ApiResponseSchema.java | 4 +- .../components/schemas/Apple.java | 4 +- .../components/schemas/AppleReq.java | 4 +- .../schemas/ArrayHoldingAnyType.java | 4 +- .../schemas/ArrayOfArrayOfNumberOnly.java | 6 +- .../components/schemas/ArrayOfEnums.java | 4 +- .../components/schemas/ArrayOfNumberOnly.java | 6 +- .../components/schemas/ArrayTest.java | 6 +- .../schemas/ArrayWithValidationsInItems.java | 4 +- .../components/schemas/Banana.java | 4 +- .../components/schemas/BananaReq.java | 4 +- .../components/schemas/Bar.java | 2 +- .../components/schemas/BasquePig.java | 4 +- .../components/schemas/BooleanEnum.java | 2 +- .../components/schemas/Capitalization.java | 4 +- .../components/schemas/Cat.java | 6 +- .../components/schemas/Category.java | 4 +- .../components/schemas/ChildCat.java | 6 +- .../components/schemas/ClassModel.java | 6 +- .../components/schemas/Client.java | 4 +- .../schemas/ComplexQuadrilateral.java | 6 +- ...posedAnyOfDifferentTypesNoValidations.java | 6 +- .../components/schemas/ComposedArray.java | 4 +- .../components/schemas/ComposedBool.java | 2 +- .../components/schemas/ComposedNone.java | 2 +- .../components/schemas/ComposedNumber.java | 2 +- .../components/schemas/ComposedObject.java | 4 +- .../schemas/ComposedOneOfDifferentTypes.java | 6 +- .../components/schemas/ComposedString.java | 2 +- .../components/schemas/Currency.java | 2 +- .../components/schemas/DanishPig.java | 4 +- .../components/schemas/DateTimeTest.java | 2 +- .../schemas/DateTimeWithValidations.java | 2 +- .../schemas/DateWithValidations.java | 2 +- .../components/schemas/Dog.java | 6 +- .../components/schemas/Drawing.java | 6 +- .../components/schemas/EnumArrays.java | 6 +- .../components/schemas/EnumClass.java | 2 +- .../components/schemas/EnumTest.java | 4 +- .../schemas/EquilateralTriangle.java | 6 +- .../components/schemas/File.java | 4 +- .../schemas/FileSchemaTestClass.java | 6 +- .../components/schemas/Foo.java | 4 +- .../components/schemas/FormatTest.java | 6 +- .../components/schemas/FromSchema.java | 4 +- .../components/schemas/Fruit.java | 6 +- .../components/schemas/FruitReq.java | 6 +- .../components/schemas/GmFruit.java | 6 +- .../components/schemas/GrandparentAnimal.java | 4 +- .../components/schemas/HasOnlyReadOnly.java | 4 +- .../components/schemas/HealthCheckResult.java | 4 +- .../components/schemas/IntegerEnum.java | 2 +- .../components/schemas/IntegerEnumBig.java | 2 +- .../schemas/IntegerEnumOneValue.java | 2 +- .../schemas/IntegerEnumWithDefaultValue.java | 2 +- .../components/schemas/IntegerMax10.java | 2 +- .../components/schemas/IntegerMin15.java | 2 +- .../components/schemas/IsoscelesTriangle.java | 6 +- .../components/schemas/Items.java | 4 +- .../components/schemas/JSONPatchRequest.java | 6 +- .../JSONPatchRequestAddReplaceTest.java | 4 +- .../schemas/JSONPatchRequestMoveCopy.java | 4 +- .../schemas/JSONPatchRequestRemove.java | 4 +- .../components/schemas/Mammal.java | 6 +- .../components/schemas/MapTest.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 4 +- .../components/schemas/Money.java | 4 +- .../components/schemas/MyObjectDto.java | 4 +- .../components/schemas/Name.java | 6 +- .../schemas/NoAdditionalProperties.java | 4 +- .../components/schemas/NullableClass.java | 6 +- .../components/schemas/NullableShape.java | 6 +- .../components/schemas/NullableString.java | 2 +- .../components/schemas/NumberOnly.java | 4 +- .../schemas/NumberWithValidations.java | 2 +- .../schemas/ObjWithRequiredProps.java | 4 +- .../schemas/ObjWithRequiredPropsBase.java | 4 +- .../ObjectModelWithArgAndArgsProperties.java | 4 +- .../schemas/ObjectModelWithRefProps.java | 4 +- ...hAllOfWithReqTestPropFromUnsetAddProp.java | 6 +- .../ObjectWithCollidingProperties.java | 4 +- .../schemas/ObjectWithDecimalProperties.java | 4 +- .../ObjectWithDifficultlyNamedProps.java | 4 +- .../ObjectWithInlineCompositionProperty.java | 6 +- ...ObjectWithInvalidNamedRefedProperties.java | 4 +- .../ObjectWithNonIntersectingValues.java | 4 +- .../schemas/ObjectWithOnlyOptionalProps.java | 4 +- .../schemas/ObjectWithOptionalTestProp.java | 4 +- .../schemas/ObjectWithValidations.java | 4 +- .../components/schemas/Order.java | 4 +- .../schemas/PaginatedResultMyObjectDto.java | 6 +- .../components/schemas/ParentPet.java | 4 +- .../components/schemas/Pet.java | 6 +- .../components/schemas/Pig.java | 6 +- .../components/schemas/Player.java | 4 +- .../components/schemas/PublicKey.java | 4 +- .../components/schemas/Quadrilateral.java | 6 +- .../schemas/QuadrilateralInterface.java | 6 +- .../components/schemas/ReadOnlyFirst.java | 4 +- .../schemas/ReqPropsFromExplicitAddProps.java | 4 +- .../schemas/ReqPropsFromTrueAddProps.java | 4 +- .../schemas/ReqPropsFromUnsetAddProps.java | 4 +- .../components/schemas/ReturnSchema.java | 6 +- .../components/schemas/ScaleneTriangle.java | 6 +- .../components/schemas/Schema200Response.java | 6 +- .../schemas/SelfReferencingArrayModel.java | 4 +- .../schemas/SelfReferencingObjectModel.java | 4 +- .../components/schemas/Shape.java | 6 +- .../components/schemas/ShapeOrNull.java | 6 +- .../schemas/SimpleQuadrilateral.java | 6 +- .../components/schemas/SomeObject.java | 6 +- .../components/schemas/SpecialModelname.java | 4 +- .../components/schemas/StringBooleanMap.java | 4 +- .../components/schemas/StringEnum.java | 2 +- .../schemas/StringEnumWithDefaultValue.java | 2 +- .../schemas/StringWithValidation.java | 2 +- .../components/schemas/Tag.java | 4 +- .../components/schemas/Triangle.java | 6 +- .../components/schemas/TriangleInterface.java | 6 +- .../components/schemas/UUIDString.java | 2 +- .../components/schemas/User.java | 6 +- .../components/schemas/Whale.java | 4 +- .../components/schemas/Zebra.java | 4 +- .../delete/HeaderParameters.java | 4 +- .../delete/PathParameters.java | 4 +- .../delete/parameters/parameter1/Schema1.java | 2 +- .../commonparamsubdir/get/PathParameters.java | 4 +- .../get/QueryParameters.java | 4 +- .../parameter0/PathParamSchema0.java | 2 +- .../post/HeaderParameters.java | 4 +- .../post/PathParameters.java | 4 +- .../paths/fake/delete/HeaderParameters.java | 4 +- .../paths/fake/delete/QueryParameters.java | 4 +- .../delete/parameters/parameter1/Schema1.java | 2 +- .../delete/parameters/parameter4/Schema4.java | 2 +- .../paths/fake/get/HeaderParameters.java | 4 +- .../paths/fake/get/QueryParameters.java | 4 +- .../get/parameters/parameter0/Schema0.java | 4 +- .../get/parameters/parameter1/Schema1.java | 2 +- .../get/parameters/parameter2/Schema2.java | 4 +- .../get/parameters/parameter3/Schema3.java | 2 +- .../get/parameters/parameter4/Schema4.java | 2 +- .../get/parameters/parameter5/Schema5.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 6 +- .../applicationxwwwformurlencoded/Schema.java | 4 +- .../put/QueryParameters.java | 4 +- .../put/QueryParameters.java | 4 +- .../delete/PathParameters.java | 4 +- .../content/applicationjson/Schema.java | 4 +- .../post/QueryParameters.java | 4 +- .../post/parameters/parameter0/Schema0.java | 6 +- .../post/parameters/parameter1/Schema1.java | 6 +- .../content/applicationjson/Schema.java | 6 +- .../content/multipartformdata/Schema.java | 6 +- .../content/applicationjson/Schema.java | 6 +- .../content/multipartformdata/Schema.java | 6 +- .../applicationxwwwformurlencoded/Schema.java | 4 +- .../content/applicationjson/Schema.java | 4 +- .../content/multipartformdata/Schema.java | 4 +- .../fakeobjinquery/get/QueryParameters.java | 4 +- .../get/parameters/parameter0/Schema0.java | 4 +- .../post/CookieParameters.java | 4 +- .../post/HeaderParameters.java | 4 +- .../post/PathParameters.java | 4 +- .../post/QueryParameters.java | 4 +- .../post/PathParameters.java | 4 +- .../content/multipartformdata/Schema.java | 4 +- .../get/QueryParameters.java | 4 +- .../get/QueryParameters.java | 4 +- .../put/QueryParameters.java | 4 +- .../put/parameters/parameter0/Schema0.java | 4 +- .../put/parameters/parameter1/Schema1.java | 4 +- .../put/parameters/parameter2/Schema2.java | 4 +- .../put/parameters/parameter3/Schema3.java | 4 +- .../put/parameters/parameter4/Schema4.java | 4 +- .../applicationoctetstream/Schema.java | 2 +- .../applicationoctetstream/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 4 +- .../content/multipartformdata/Schema.java | 6 +- .../content/applicationjson/Schema.java | 4 +- .../petfindbystatus/get/QueryParameters.java | 4 +- .../get/parameters/parameter0/Schema0.java | 4 +- .../petfindbytags/get/QueryParameters.java | 4 +- .../get/parameters/parameter0/Schema0.java | 4 +- .../petpetid/delete/HeaderParameters.java | 4 +- .../paths/petpetid/delete/PathParameters.java | 4 +- .../paths/petpetid/get/PathParameters.java | 4 +- .../paths/petpetid/post/PathParameters.java | 4 +- .../applicationxwwwformurlencoded/Schema.java | 4 +- .../post/PathParameters.java | 4 +- .../content/multipartformdata/Schema.java | 4 +- .../delete/PathParameters.java | 4 +- .../storeorderorderid/get/PathParameters.java | 4 +- .../get/parameters/parameter0/Schema0.java | 2 +- .../paths/userlogin/get/QueryParameters.java | 4 +- .../get/responses/response200/Headers.java | 4 +- .../userusername/delete/PathParameters.java | 4 +- .../userusername/get/PathParameters.java | 4 +- .../userusername/put/PathParameters.java | 4 +- .../schemas/AnyTypeJsonSchema.java | 3 + .../schemas/BooleanJsonSchema.java | 6 +- .../schemas/DateJsonSchema.java | 5 +- .../schemas/DateTimeJsonSchema.java | 5 +- .../schemas/DecimalJsonSchema.java | 6 +- .../schemas/DoubleJsonSchema.java | 6 +- .../schemas/FloatJsonSchema.java | 6 +- .../schemas/Int32JsonSchema.java | 6 +- .../schemas/Int64JsonSchema.java | 6 +- .../schemas/IntJsonSchema.java | 6 +- .../schemas/ListJsonSchema.java | 6 +- .../schemas/MapJsonSchema.java | 6 +- .../schemas/NotAnyTypeJsonSchema.java | 10 +- .../schemas/NullJsonSchema.java | 6 +- .../schemas/NumberJsonSchema.java | 6 +- .../schemas/StringJsonSchema.java | 3 +- .../schemas/UuidJsonSchema.java | 5 +- .../AdditionalPropertiesValidator.java | 6 +- .../schemas/validation/FakeValidator.java | 2 +- .../schemas/validation/FormatValidator.java | 2 +- .../schemas/{ => validation}/FrozenList.java | 2 +- .../schemas/{ => validation}/FrozenMap.java | 2 +- .../schemas/validation/ItemsValidator.java | 6 +- .../schemas/{ => validation}/JsonSchema.java | 131 ++++++++++++++++-- .../schemas/validation/KeywordValidator.java | 2 +- .../schemas/validation/PathToSchemasMap.java | 6 +- .../{ => validation}/PathToTypeMap.java | 2 +- .../validation/PropertiesValidator.java | 6 +- .../schemas/validation/RequiredValidator.java | 2 +- .../schemas/validation/SchemaValidator.java | 125 ----------------- .../schemas/validation/TypeValidator.java | 2 +- .../UnsetAnyTypeJsonSchema.java | 2 +- .../validation/ValidationMetadata.java | 4 +- .../schemas/AnyTypeSchemaTest.java | 3 + .../schemas/ArrayTypeSchemaTest.java | 4 +- .../schemas/BooleanSchemaTest.java | 3 +- .../schemas/ListSchemaTest.java | 4 +- .../schemas/MapSchemaTest.java | 4 +- .../schemas/NullSchemaTest.java | 3 +- .../schemas/NumberSchemaTest.java | 3 +- .../schemas/ObjectTypeSchemaTest.java | 4 +- .../schemas/RefBooleanSchemaTest.java | 3 +- .../AdditionalPropertiesValidatorTest.java | 10 +- .../validation/FormatValidatorTest.java | 52 +++---- .../validation/ItemsValidatorTest.java | 10 +- ...ValidatorTest.java => JsonSchemaTest.java} | 9 +- .../validation/PropertiesValidatorTest.java | 10 +- .../validation/RequiredValidatorTest.java | 7 +- .../schemas/validation/TypeValidatorTest.java | 4 +- .../generators/JavaClientGenerator.java | 56 ++++---- .../schemas/AnyTypeJsonSchema.hbs | 3 + .../schemas/BooleanJsonSchema.hbs | 6 +- .../openapitools/schemas/DateJsonSchema.hbs | 5 +- .../schemas/DateTimeJsonSchema.hbs | 5 +- .../schemas/DecimalJsonSchema.hbs | 6 +- .../openapitools/schemas/DoubleJsonSchema.hbs | 6 +- .../openapitools/schemas/FloatJsonSchema.hbs | 6 +- .../openapitools/schemas/Int32JsonSchema.hbs | 6 +- .../openapitools/schemas/Int64JsonSchema.hbs | 6 +- .../openapitools/schemas/IntJsonSchema.hbs | 6 +- .../openapitools/schemas/ListJsonSchema.hbs | 6 +- .../openapitools/schemas/MapJsonSchema.hbs | 6 +- .../schemas/NotAnyTypeJsonSchema.hbs | 10 +- .../openapitools/schemas/NullJsonSchema.hbs | 6 +- .../openapitools/schemas/NumberJsonSchema.hbs | 6 +- .../openapitools/schemas/StringJsonSchema.hbs | 3 +- .../openapitools/schemas/UuidJsonSchema.hbs | 5 +- .../AdditionalPropertiesValidator.hbs | 6 +- .../schemas/validation/FakeValidator.hbs | 2 +- .../schemas/validation/FormatValidator.hbs | 2 +- .../schemas/{ => validation}/FrozenList.hbs | 2 +- .../schemas/{ => validation}/FrozenMap.hbs | 2 +- .../schemas/validation/ItemsValidator.hbs | 6 +- .../schemas/{ => validation}/JsonSchema.hbs | 131 ++++++++++++++++-- .../schemas/validation/KeywordValidator.hbs | 2 +- .../schemas/validation/PathToSchemasMap.hbs | 6 +- .../{ => validation}/PathToTypeMap.hbs | 2 +- .../validation/PropertiesValidator.hbs | 6 +- .../schemas/validation/RequiredValidator.hbs | 2 +- .../schemas/validation/SchemaValidator.hbs | 125 ----------------- .../schemas/validation/TypeValidator.hbs | 2 +- .../UnsetAnyTypeJsonSchema.hbs | 2 +- .../schemas/validation/ValidationMetadata.hbs | 4 +- .../schemas/AnyTypeSchemaTest.hbs | 3 + .../schemas/ArrayTypeSchemaTest.hbs | 4 +- .../schemas/BooleanSchemaTest.hbs | 3 +- .../openapitools/schemas/ListSchemaTest.hbs | 4 +- .../openapitools/schemas/MapSchemaTest.hbs | 4 +- .../openapitools/schemas/NullSchemaTest.hbs | 3 +- .../openapitools/schemas/NumberSchemaTest.hbs | 3 +- .../schemas/ObjectTypeSchemaTest.hbs | 4 +- .../schemas/RefBooleanSchemaTest.hbs | 3 +- .../AdditionalPropertiesValidatorTest.hbs | 10 +- .../validation/FormatValidatorTest.hbs | 52 +++---- .../schemas/validation/ItemsValidatorTest.hbs | 10 +- ...maValidatorTest.hbs => JsonSchemaTest.hbs} | 9 +- .../validation/PropertiesValidatorTest.hbs | 10 +- .../validation/RequiredValidatorTest.hbs | 7 +- .../schemas/validation/TypeValidatorTest.hbs | 4 +- 315 files changed, 943 insertions(+), 1088 deletions(-) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/FrozenList.java (95%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/FrozenMap.java (97%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/JsonSchema.java (55%) rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/PathToTypeMap.java (72%) delete mode 100644 samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java rename samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/{ => validation}/UnsetAnyTypeJsonSchema.java (97%) rename samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/{SchemaValidatorTest.java => JsonSchemaTest.java} (82%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/FrozenList.hbs (96%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/FrozenMap.hbs (98%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/JsonSchema.hbs (55%) rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/PathToTypeMap.hbs (75%) delete mode 100644 src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs rename src/main/resources/java/src/main/java/org/openapitools/schemas/{ => validation}/UnsetAnyTypeJsonSchema.hbs (97%) rename src/main/resources/java/src/test/java/org/openapitools/schemas/validation/{SchemaValidatorTest.hbs => JsonSchemaTest.hbs} (81%) diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index 456bbca45a0..8388dd58d2c 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -348,32 +348,31 @@ src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java -src/main/java/org/openapijsonschematools/schemas/FrozenList.java -src/main/java/org/openapijsonschematools/schemas/FrozenMap.java src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java -src/main/java/org/openapijsonschematools/schemas/JsonSchema.java src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java -src/main/java/org/openapijsonschematools/schemas/PathToTypeMap.java src/main/java/org/openapijsonschematools/schemas/StringJsonSchema.java -src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java src/main/java/org/openapijsonschematools/schemas/validation/CustomIsoparser.java src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/FrozenList.java +src/main/java/org/openapijsonschematools/schemas/validation/FrozenMap.java src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java +src/main/java/org/openapijsonschematools/schemas/validation/PathToTypeMap.java src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java -src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java +src/main/java/org/openapijsonschematools/schemas/validation/UnsetAnyTypeJsonSchema.java src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java src/test/java/org/openapijsonschematools/configurations/JsonSchemaKeywordFlagsTest.java src/test/java/org/openapijsonschematools/schemas/AnyTypeSchemaTest.java @@ -389,7 +388,7 @@ src/test/java/org/openapijsonschematools/schemas/validation/AdditionalProperties src/test/java/org/openapijsonschematools/schemas/validation/CustomIsoparserTest.java src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java +src/test/java/org/openapijsonschematools/schemas/validation/JsonSchemaTest.java src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java -src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java 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 f4f03404491..7826663dbb5 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 @@ -4,8 +4,8 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 5cc9ea1b5af..25f492dcf1d 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Headers { // 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/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java index 2b7b8fe9f58..0da641ce274 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 @@ -5,8 +5,8 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 83dbaba177b..b19492b5d5a 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 @@ -4,8 +4,8 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 598e8451cfe..ea7f46661d8 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Headers { // 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/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java index 1560d1ea338..cfd7de80c1a 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 @@ -3,9 +3,9 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/successwithjsonapiresponse/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java index 63324240bdc..52728f3b3a3 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 @@ -10,9 +10,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Headers { // 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/AbstractStepMessage.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java index cf38368fa7a..d540ede9372 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class AbstractStepMessage { // 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/AdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesClass.java index 68bcf84cfec..ec184029876 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 @@ -6,11 +6,11 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.MapJsonSchema; import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class AdditionalPropertiesClass { // 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/AdditionalPropertiesValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesValidator.java index cd79d933ea7..7e890d8ec05 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 @@ -8,9 +8,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class AdditionalPropertiesValidator { // 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/AdditionalPropertiesWithArrayOfEnums.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalPropertiesWithArrayOfEnums.java index c5cbadf5806..3ab72edc4d4 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 @@ -4,9 +4,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 606ead4d65c..83f875e4272 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 @@ -3,9 +3,9 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Address { // 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/Animal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Animal.java index 768940c6b22..17d089cccdd 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Animal { // 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/AnimalFarm.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnimalFarm.java index a1f53216378..77e2ad18c51 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 @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 cd495964ea8..b24223796d3 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class AnyTypeAndFormat { // 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/AnyTypeNotString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeNotString.java index a596221f1c6..d8f5fd35321 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 @@ -5,10 +5,10 @@ import java.util.Map; 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class AnyTypeNotString { // 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/ApiResponseSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ApiResponseSchema.java index 6a4a4064c71..76e5af85c58 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 @@ -5,10 +5,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ApiResponseSchema { // 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/Apple.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Apple.java index 1c6625ab117..c1c00280bcb 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Apple { // 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/AppleReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AppleReq.java index ed45b488969..43f828c2c8f 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 @@ -7,10 +7,10 @@ import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; import org.openapijsonschematools.schemas.BooleanJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class AppleReq { // 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/ArrayHoldingAnyType.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayHoldingAnyType.java index 89783717afc..01d06d58132 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 @@ -4,8 +4,8 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ArrayHoldingAnyType { // 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/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java index 06da9e93944..7ac63828892 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 @@ -6,10 +6,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ArrayOfArrayOfNumberOnly { // 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/ArrayOfEnums.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfEnums.java index 306e77f1a48..7744ed691d9 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 @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 ea1104cb08b..ddc8cad9cc3 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 @@ -6,10 +6,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ArrayOfNumberOnly { // 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/ArrayTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayTest.java index ea6ae213006..dbb8abc352c 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 @@ -6,11 +6,11 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ArrayTest { // 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/ArrayWithValidationsInItems.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayWithValidationsInItems.java index 49136258a56..ea27b79bc5e 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 @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 7b289bf31e0..a2f68be589c 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 @@ -5,9 +5,9 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Banana { // 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/BananaReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BananaReq.java index 84628e9661c..47057f0bb72 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 @@ -7,10 +7,10 @@ import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; import org.openapijsonschematools.schemas.BooleanJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.schemas.NumberJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class BananaReq { // 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/Bar.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Bar.java index f30aa195bd1..01c26b74350 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 2b54aa8e2d9..220bb98d01c 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class BasquePig { // 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/BooleanEnum.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BooleanEnum.java index aaba343af70..a269f1fec4d 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/Capitalization.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java index 05bdefddd9b..17e28da8451 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Capitalization { // 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/Cat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Cat.java index b9c1352b6c7..abe37265987 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 @@ -10,9 +10,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Cat { // 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/Category.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Category.java index f7c37d7405f..b03cea16eba 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 @@ -5,9 +5,9 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Category { // 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/ChildCat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ChildCat.java index eb577b85bbd..5b14915cd0a 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 @@ -9,10 +9,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ChildCat { // 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/ClassModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ClassModel.java index 6f1f51483b2..65c335578f0 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 @@ -7,10 +7,10 @@ import java.util.Map; 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ClassModel { // 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/Client.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Client.java index fc35172eb28..1e9a244167a 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Client { // 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/ComplexQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComplexQuadrilateral.java index 7597ffdec1f..1187b4b23b2 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComplexQuadrilateral { // 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/ComposedAnyOfDifferentTypesNoValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedAnyOfDifferentTypesNoValidations.java index 49e77cb1e69..fbe0a5df439 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 @@ -13,16 +13,16 @@ import org.openapijsonschematools.schemas.DateTimeJsonSchema; import org.openapijsonschematools.schemas.DoubleJsonSchema; import org.openapijsonschematools.schemas.FloatJsonSchema; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.Int32JsonSchema; import org.openapijsonschematools.schemas.Int64JsonSchema; import org.openapijsonschematools.schemas.IntJsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.MapJsonSchema; import org.openapijsonschematools.schemas.NullJsonSchema; import org.openapijsonschematools.schemas.NumberJsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedAnyOfDifferentTypesNoValidations { // 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/ComposedArray.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedArray.java index f244d278845..266447325ac 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 @@ -4,8 +4,8 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedArray { // 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/ComposedBool.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedBool.java index 6fbce3758d5..cc4ef0a8741 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 @@ -3,7 +3,7 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedBool { // 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/ComposedNone.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNone.java index 9b88fb3dbb0..e6b96637333 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 @@ -3,7 +3,7 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedNone { // 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/ComposedNumber.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedNumber.java index 990e265a14f..00eb3546423 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 @@ -3,7 +3,7 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedNumber { // 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/ComposedObject.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedObject.java index 18183315461..3b814337035 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 @@ -4,8 +4,8 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedObject { // 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/ComposedOneOfDifferentTypes.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedOneOfDifferentTypes.java index ec8018174b9..d11133d2069 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 @@ -9,10 +9,10 @@ import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; import org.openapijsonschematools.schemas.DateJsonSchema; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.NullJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedOneOfDifferentTypes { // 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/ComposedString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ComposedString.java index c323a5066bd..44e10899ad3 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 @@ -3,7 +3,7 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ComposedString { // 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/Currency.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Currency.java index a63b3898f26..ab64c516c7b 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 41ca587c4d1..399cfd7c6a4 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class DanishPig { // 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/DateTimeTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/DateTimeTest.java index a3034de7466..51d279694f2 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 @@ -3,7 +3,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 9114b368858..ae1661ca333 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 @@ -3,7 +3,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 eb66076dd85..bbdc622e15f 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 @@ -3,7 +3,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/Dog.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java index 03e00aad1f3..0717cdee69f 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 @@ -9,10 +9,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Dog { // 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/Drawing.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Drawing.java index bc8b9d03396..b92f875b6f9 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 @@ -6,9 +6,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 218ab40d9f9..c86c5ac36eb 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 @@ -6,9 +6,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 c9d3d860d98..e904f029cb6 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 6a126c8ec2e..d8fdb82f1cd 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class EnumTest { // 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/EquilateralTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/EquilateralTriangle.java index 120a701b843..44c7bbadec9 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class EquilateralTriangle { // 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/File.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/File.java index 5fb95322aae..125a6a31f88 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class File { // 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/FileSchemaTestClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FileSchemaTestClass.java index e0625b9d974..ecebeccb9ea 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 @@ -6,9 +6,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 4c78b832ef0..1e960a988b5 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 f5daf7eb65d..99c98a191f1 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 @@ -10,15 +10,15 @@ import org.openapijsonschematools.schemas.DateTimeJsonSchema; import org.openapijsonschematools.schemas.DoubleJsonSchema; import org.openapijsonschematools.schemas.FloatJsonSchema; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.Int32JsonSchema; import org.openapijsonschematools.schemas.Int64JsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.NullJsonSchema; import org.openapijsonschematools.schemas.NumberJsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; import org.openapijsonschematools.schemas.UuidJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class FormatTest { // 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/FromSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FromSchema.java index e65bdbf82e9..c05cc873528 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 @@ -5,10 +5,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class FromSchema { // 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/Fruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Fruit.java index 58615ddea93..15b0dbae51c 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 @@ -7,10 +7,10 @@ import java.util.Map; 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Fruit { // 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/FruitReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FruitReq.java index 42e0f29fea6..0ae6cfadf0f 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 @@ -5,10 +5,10 @@ import java.util.Map; 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.NullJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class FruitReq { // 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/GmFruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GmFruit.java index b0a62e918e7..a09c1a0913b 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 @@ -7,10 +7,10 @@ import java.util.Map; 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class GmFruit { // 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/GrandparentAnimal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/GrandparentAnimal.java index 64604e93c27..acff8b4f380 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class GrandparentAnimal { // 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/HasOnlyReadOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HasOnlyReadOnly.java index d1f39c26abf..a5f1d5018c4 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class HasOnlyReadOnly { // 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/HealthCheckResult.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/HealthCheckResult.java index 6212a0ef26b..9ccd9c857cf 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 700b3f7241d..85681bf1e00 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 b53578be755..8592981e83b 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 c19057bfdb4..142d98c6bc9 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 de21582fe70..71b187b318f 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 97e83c5fcb2..4b187a9a0ef 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 849222d72ac..379dac1e8a2 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 d5c8e97c002..b12d7035a77 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class IsoscelesTriangle { // 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/Items.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Items.java index 3e1576ff3d9..23b9d61030f 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 @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.MapJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Items { // 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/JSONPatchRequest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequest.java index 3ad9df777fc..fe411dc4a3a 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 @@ -7,9 +7,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class JSONPatchRequest { // 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/JSONPatchRequestAddReplaceTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestAddReplaceTest.java index b5354984442..a8a3ba4026d 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 @@ -6,10 +6,10 @@ import java.util.Set; 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; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class JSONPatchRequestAddReplaceTest { // 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/JSONPatchRequestMoveCopy.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestMoveCopy.java index 1ab5f075edf..43b479bb565 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 @@ -6,10 +6,10 @@ import java.util.Set; 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; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class JSONPatchRequestMoveCopy { // 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/JSONPatchRequestRemove.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/JSONPatchRequestRemove.java index 942a9d28690..fc4db99a58a 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 @@ -6,10 +6,10 @@ import java.util.Set; 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; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class JSONPatchRequestRemove { // 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/Mammal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Mammal.java index 45420dc8ec8..728c29f604f 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 @@ -5,9 +5,9 @@ import java.util.Map; 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Mammal { // 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/MapTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java index 71e6e7975dd..52d700dbd6c 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 @@ -6,9 +6,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class MapTest { // 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/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java index ab33683b869..4d3500b720a 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 @@ -6,9 +6,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class MixedPropertiesAndAdditionalPropertiesClass { // 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/Money.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Money.java index a8967c31118..f768b927d1f 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 @@ -7,9 +7,9 @@ import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; import org.openapijsonschematools.schemas.DecimalJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Money { // 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/MyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MyObjectDto.java index 426a2204970..e44dc21ae93 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 @@ -6,10 +6,10 @@ import java.util.Set; 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; import org.openapijsonschematools.schemas.UuidJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class MyObjectDto { // 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/Name.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Name.java index e5d69ccffa7..a330db19a2d 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 @@ -9,11 +9,11 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Name { // 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/NoAdditionalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NoAdditionalProperties.java index 295ec57e6c2..ec6e4dabd69 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 @@ -6,10 +6,10 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.Int64JsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class NoAdditionalProperties { // 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/NullableClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableClass.java index 19ffcfd2494..dcbb1a8235b 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 @@ -8,10 +8,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class NullableClass { // 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/NullableShape.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableShape.java index 8104e2bec8b..f10d5762f5b 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 @@ -5,10 +5,10 @@ import java.util.Map; 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.NullJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class NullableShape { // 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/NullableString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NullableString.java index 44ccff18f75..d62aad6ecd4 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 57c3c843321..1797e9a5934 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 @@ -5,9 +5,9 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class NumberOnly { // 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/NumberWithValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/NumberWithValidations.java index 75caa48fb40..a3e0a2fb7d3 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 b35a8139276..50956855aec 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjWithRequiredProps { // 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/ObjWithRequiredPropsBase.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjWithRequiredPropsBase.java index 2ef601a0f7f..068bea8f480 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjWithRequiredPropsBase { // 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/ObjectModelWithArgAndArgsProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java index 4902982029c..40573b375de 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectModelWithArgAndArgsProperties { // 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/ObjectModelWithRefProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithRefProps.java index 820d07c3001..206f7ab1c33 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 3136da1ae03..ac0f577708f 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 @@ -9,10 +9,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithAllOfWithReqTestPropFromUnsetAddProp { // 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/ObjectWithCollidingProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithCollidingProperties.java index 07c68358bd8..8477cb7cba9 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithCollidingProperties { // 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/ObjectWithDecimalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDecimalProperties.java index e98cf902826..0458889d509 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 @@ -6,8 +6,8 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.DecimalJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithDecimalProperties { // 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/ObjectWithDifficultlyNamedProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithDifficultlyNamedProps.java index 51de1031243..cca6c281a75 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 @@ -5,11 +5,11 @@ 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.IntJsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithDifficultlyNamedProps { // 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/ObjectWithInlineCompositionProperty.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInlineCompositionProperty.java index fb09bd32e14..c11058b5970 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithInlineCompositionProperty { // 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/ObjectWithInvalidNamedRefedProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithInvalidNamedRefedProperties.java index 42b1d80e42a..f84e65a9d45 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithInvalidNamedRefedProperties { // 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/ObjectWithNonIntersectingValues.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithNonIntersectingValues.java index 8ff55822a5e..f45b6bd9092 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 @@ -5,10 +5,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithNonIntersectingValues { // 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/ObjectWithOnlyOptionalProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOnlyOptionalProps.java index 77537293811..f28394d4cc4 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 @@ -6,11 +6,11 @@ import java.util.Set; 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; import org.openapijsonschematools.schemas.NumberJsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithOnlyOptionalProps { // 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/ObjectWithOptionalTestProp.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithOptionalTestProp.java index 9c30f6a250b..30f16c2afb9 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ObjectWithOptionalTestProp { // 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/ObjectWithValidations.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectWithValidations.java index e38a4b900bf..5e2b5ddc83e 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 @@ -3,8 +3,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 a8efa21467b..f4542ad6b9b 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 @@ -7,10 +7,10 @@ import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.BooleanJsonSchema; import org.openapijsonschematools.schemas.DateTimeJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.Int32JsonSchema; import org.openapijsonschematools.schemas.Int64JsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Order { // 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/PaginatedResultMyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PaginatedResultMyObjectDto.java index e3a815a1dea..7fcef5c21fb 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 @@ -7,11 +7,11 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.IntJsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PaginatedResultMyObjectDto { // 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/ParentPet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ParentPet.java index 8b5efd3ee13..4fb1ac72e21 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 @@ -3,8 +3,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 9295503d8de..d2a07fe4630 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 @@ -6,11 +6,11 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Pet { // 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/Pig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pig.java index da2bba335dc..d321bf4b5d2 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 @@ -5,9 +5,9 @@ import java.util.Map; 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Pig { // 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/Player.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java index 2b0becee597..7a553496472 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Player { // 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/PublicKey.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/PublicKey.java index 3eb7531bb27..03702e2a87b 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PublicKey { // 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/Quadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Quadrilateral.java index 6872dd67181..08be1dc1f4d 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 @@ -5,9 +5,9 @@ import java.util.Map; 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Quadrilateral { // 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/QuadrilateralInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/QuadrilateralInterface.java index 7e4868d100c..56a3cbcf713 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 @@ -9,10 +9,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QuadrilateralInterface { // 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/ReadOnlyFirst.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReadOnlyFirst.java index 7cddf71a457..0c947b07d5e 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ReadOnlyFirst { // 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/ReqPropsFromExplicitAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromExplicitAddProps.java index c0fdcd6ec86..31d9bb038f7 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 @@ -3,9 +3,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ReqPropsFromExplicitAddProps { // 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/ReqPropsFromTrueAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromTrueAddProps.java index 7c237f65c99..c078bfcaf1c 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 @@ -4,8 +4,8 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ReqPropsFromTrueAddProps { // 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/ReqPropsFromUnsetAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReqPropsFromUnsetAddProps.java index 03d674264da..07f964898ac 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 @@ -3,8 +3,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ReqPropsFromUnsetAddProps { // 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/ReturnSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ReturnSchema.java index ea79377be64..8a4289e9852 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 @@ -7,10 +7,10 @@ import java.util.Map; 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ReturnSchema { // 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/ScaleneTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java index 4148e18e434..dcc629c9be1 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ScaleneTriangle { // 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/Schema200Response.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Schema200Response.java index 78f9382654f..2f90e6823d0 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 @@ -7,11 +7,11 @@ import java.util.Map; 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Schema200Response { // 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/SelfReferencingArrayModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SelfReferencingArrayModel.java index 6569e5af319..159598add82 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 @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 d381189f16a..60bdb8fef88 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 @@ -5,8 +5,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 9b5a02f89a3..c64e063770f 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 @@ -5,9 +5,9 @@ import java.util.Map; 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Shape { // 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/ShapeOrNull.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ShapeOrNull.java index 6f8777404f2..a91e498968e 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 @@ -5,10 +5,10 @@ import java.util.Map; 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.NullJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class ShapeOrNull { // 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/SimpleQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SimpleQuadrilateral.java index d93b2a3c66e..736da38a7f0 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class SimpleQuadrilateral { // 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/SomeObject.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SomeObject.java index 622f19c14f3..ee20add6068 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 @@ -5,9 +5,9 @@ import java.util.Map; 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class SomeObject { // 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/SpecialModelname.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/SpecialModelname.java index 2f5bab876ee..f02dab2354d 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class SpecialModelname { // 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/StringBooleanMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringBooleanMap.java index c82ace15b8f..bf359b7d737 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 @@ -4,8 +4,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class StringBooleanMap { // 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/StringEnum.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringEnum.java index 21849d98f46..dc9406bd25e 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 601d60062cb..e9f573137fd 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/StringWithValidation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/StringWithValidation.java index 567d0bc2055..d5c209cc332 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 7a5a8570be5..77738e9113e 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 @@ -5,10 +5,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Tag { // 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/Triangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Triangle.java index b355f55a0f2..9b646da44c2 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 @@ -5,9 +5,9 @@ import java.util.Map; 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Triangle { // 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/TriangleInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/TriangleInterface.java index 034866075eb..160015d76be 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 @@ -9,10 +9,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class TriangleInterface { // 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/UUIDString.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/UUIDString.java index dac6ce32779..04e810e4f67 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 @@ -3,7 +3,7 @@ import java.util.Set; import java.util.UUID; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 66653aa0605..2283a4a8f09 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 @@ -10,14 +10,14 @@ 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.Int32JsonSchema; import org.openapijsonschematools.schemas.Int64JsonSchema; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.MapJsonSchema; import org.openapijsonschematools.schemas.NullJsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class User { // 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/Whale.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Whale.java index 65ebb720c07..784d8b9ec52 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 @@ -6,8 +6,8 @@ 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.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Whale { // 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/Zebra.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Zebra.java index bdbce1ca308..1d11bad5dd2 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 @@ -6,8 +6,8 @@ import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; import org.openapijsonschematools.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.schemas.FrozenMap; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Zebra { // 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/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java index 7e14f83527e..23dd4b2f042 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class HeaderParameters { // 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/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java index 9bf738e8251..ecb84ac041e 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/delete/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/parameters/parameter1/Schema1.java index 2ab2f91dafb..03c538e9edd 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 0fa825781ee..748af044a12 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/QueryParameters.java index a92b282fac8..ce60896ef4a 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/parameters/parameter0/PathParamSchema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/parameters/parameter0/PathParamSchema0.java index 70b4b550e83..865512bccd5 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 622ffc16e60..fff1bb5d618 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class HeaderParameters { // 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/PathParameters.java index 689bdfe4cbb..a7a0a217c43 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/HeaderParameters.java index d0bb6653341..d926e151f5c 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 @@ -8,9 +8,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class HeaderParameters { // 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/QueryParameters.java index 26dafc8c23f..6686d5e79fe 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 @@ -10,9 +10,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter1/Schema1.java index a7e5ad7a4fc..2375ad55772 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/parameter4/Schema4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/parameters/parameter4/Schema4.java index fd50df3fe26..71dd6954dfa 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/HeaderParameters.java index 8975d0ca038..637ae021d8e 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 @@ -8,9 +8,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class HeaderParameters { // 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/QueryParameters.java index 7f499dcd5dd..42be28bfc34 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 @@ -10,9 +10,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/parameters/parameter0/Schema0.java index 9b54d693e70..916f7c536bc 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 @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 9090fbbb7a6..2defe740bde 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 e5eb9f7e77b..e1fe7e8bf62 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 @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 3f4556c6458..b2a9df8e57a 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 89fb784f1b4..12073ee77e0 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 3c6fa3721a6..a1f044efa62 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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 55a3b37e537..e63c3b0221b 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 @@ -6,9 +6,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 b4a99656671..f39cb86a166 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 @@ -7,10 +7,10 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/fakebodywithqueryparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/QueryParameters.java index 334ccee2b97..e0c2dfcb80c 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/fakecasesensitiveparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/QueryParameters.java index 8765898e682..9e51a716762 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 @@ -9,9 +9,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/fakedeletecoffeeid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/PathParameters.java index 82880d02c22..2d53d0001b1 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/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 bf90bd9c486..ba442224e02 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 @@ -3,9 +3,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/fakeinlinecomposition/post/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/QueryParameters.java index 4304946637b..a2d25da634d 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 @@ -8,9 +8,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/fakeinlinecomposition/post/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter0/Schema0.java index fbda3b70878..642a1dc23a9 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 @@ -7,9 +7,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/fakeinlinecomposition/post/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java index 10b12af5871..0dd66c9e80b 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 37fe5d63667..53d032461ef 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 @@ -7,9 +7,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 7db128f2099..e7ff01b75dc 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 2b9201df4fe..bc6965f002a 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 @@ -7,9 +7,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 ff1db2d9f48..49e047f97fd 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 @@ -9,9 +9,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 65294c499e1..c97cd4b6321 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 9380da71266..32b1b85e05d 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 9bcd4c51ed5..0fca8bdaca2 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/fakeobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/QueryParameters.java index 5d27ca42e48..80b5223f5cb 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/fakeobjinquery/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java index 1d81b8eb9fc..9fa6bf32ca9 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/fakeparametercollisions1ababselfab/post/CookieParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java index 155a7e4c475..24707f1203e 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 @@ -11,9 +11,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class CookieParameters { // 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/fakeparametercollisions1ababselfab/post/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java index 4326d4f5556..a5bd05335f7 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 @@ -10,9 +10,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class HeaderParameters { // 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/fakeparametercollisions1ababselfab/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/PathParameters.java index b21b60dbd64..a91cbd3c221 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 @@ -11,9 +11,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/fakeparametercollisions1ababselfab/post/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java index 96bf75b7f2e..8f5bfe2ae08 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 @@ -11,9 +11,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/fakepetiduploadimagewithrequiredfile/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java index 44ac49791d1..efab083a2ca 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/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 0e02c520f49..858ee9e7d17 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/fakequeryparamwithjsoncontenttype/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java index bf68241975f..45b18f84b29 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/fakerefobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/QueryParameters.java index b102f4cd6a0..8326721e6e4 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/faketestqueryparamters/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/QueryParameters.java index e85a8f1e500..6e3310a8a76 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 @@ -12,9 +12,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/faketestqueryparamters/put/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter0/Schema0.java index 912eec3a8d1..c571b27aeb4 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 @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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/faketestqueryparamters/put/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter1/Schema1.java index 8596a23aab3..4bf5d47524b 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 @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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/faketestqueryparamters/put/parameters/parameter2/Schema2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter2/Schema2.java index 97aad9edd2d..39c3af05152 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 @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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/faketestqueryparamters/put/parameters/parameter3/Schema3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter3/Schema3.java index 332574a3750..6baf6f0e0a5 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 @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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/faketestqueryparamters/put/parameters/parameter4/Schema4.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/parameters/parameter4/Schema4.java index 28153c3e155..5233b4c9705 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 @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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/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 22f19e31a97..e68477a7e2f 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,5 +1,5 @@ package org.openapijsonschematools.paths.fakeuploaddownloadfile.post.requestbody.content.applicationoctetstream; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/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 00980451a13..e279a647c96 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,5 +1,5 @@ package org.openapijsonschematools.paths.fakeuploaddownloadfile.post.responses.response200.content.applicationoctetstream; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/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 46f5dbe57ac..28d34995b13 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 b4de40ad5e0..4d5c73f0153 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 @@ -6,9 +6,9 @@ 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.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/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 8f98af50ca2..72cfe88cba8 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 @@ -6,8 +6,8 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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 f5b54f2cbf2..7bae2e703ed 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/parameters/parameter0/Schema0.java index 5a4e94308d7..2994b2cd4ea 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 @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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 ae862ffc018..a717efc17c4 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/parameters/parameter0/Schema0.java index d0d1eee8c0a..3b44204ba7e 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 @@ -3,9 +3,9 @@ import java.util.List; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; -import org.openapijsonschematools.schemas.JsonSchema; import org.openapijsonschematools.schemas.StringJsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.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/petpetid/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/HeaderParameters.java index 46213f940e3..80a57a6a6b4 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class HeaderParameters { // 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/petpetid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/PathParameters.java index aad74ef518b..f64afa9f487 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/petpetid/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/PathParameters.java index b54ea11eec1..5d673c454a0 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/petpetid/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/PathParameters.java index 9c2a212ff8d..f8c7cc1ea7e 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/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 54a4e5bcb89..dd1464a7833 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/petpetiduploadimage/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/PathParameters.java index a82d1c13cff..b20d60c9634 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/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 7e43689a33f..5239cbb733d 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 @@ -5,9 +5,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.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/storeorderorderid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/PathParameters.java index d2b6ffeeb72..09335752735 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/PathParameters.java index 486ae44a8ed..44ae2806014 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/parameters/parameter0/Schema0.java index ff2136c2738..98f2fd66838 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 @@ -2,7 +2,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.JsonSchema; +import org.openapijsonschematools.schemas.validation.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/userlogin/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/QueryParameters.java index e11ebd42475..1b2987db8c1 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 @@ -8,9 +8,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class QueryParameters { // 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/userlogin/get/responses/response200/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/Headers.java index 916d619ba71..d0625b34a56 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 @@ -11,9 +11,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class Headers { // 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/userusername/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/delete/PathParameters.java index 47d51b95ef6..f2c9661e2d0 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/userusername/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/get/PathParameters.java index c6b3ba11d58..8a3db427370 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // 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/userusername/put/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java index e99a31e069f..4d67fb0913a 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 @@ -7,9 +7,9 @@ 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; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class PathParameters { // nest classes so all schemas and input/output classes can be public 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 9c270c13d0c..a80bc88eebd 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 @@ -1,5 +1,8 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.FrozenList; import org.openapijsonschematools.configurations.SchemaConfiguration; import java.time.LocalDate; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java index 37c9b3b619a..fff76397265 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/BooleanJsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class BooleanJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java index b9f5d12ee89..04ce824c1dd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateJsonSchema.java @@ -1,14 +1,11 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class DateJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java index 1047b16c690..86cfabf49c4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DateTimeJsonSchema.java @@ -1,14 +1,11 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class DateTimeJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java index 6ae5a1b5e37..2eb9ad6d540 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DecimalJsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class DecimalJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java index bc278e7e89b..da0a5778d38 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/DoubleJsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class DoubleJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java index dc111d0d5f0..36238eff721 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FloatJsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class FloatJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java index 9e741214cac..a2ecbe64a58 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int32JsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class Int32JsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java index 487b1ffd186..69ab43c866f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class Int64JsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java index 39b9c3b6533..375e62c7947 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class IntJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java index 8070d83734b..948f7e64ffa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java @@ -1,14 +1,12 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class ListJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java index fd02043fdc4..ec2957339bf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java @@ -1,14 +1,12 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.FrozenMap; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class MapJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java index 7458ad76ec1..941b782d4bd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java @@ -1,14 +1,6 @@ package org.openapijsonschematools.schemas; -import org.openapijsonschematools.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; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class NotAnyTypeJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java index e8c3ba5c0d4..b13589dec8e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class NullJsonSchema extends JsonSchema { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java index 1cfdd7d9a5b..9bfe0895db5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java @@ -1,14 +1,10 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; public class NumberJsonSchema extends JsonSchema { 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 1bc223cd820..ef82a27a9bd 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 @@ -1,12 +1,11 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java index f56220c6e99..de4a9fa02b4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UuidJsonSchema.java @@ -1,12 +1,9 @@ package org.openapijsonschematools.schemas; +import org.openapijsonschematools.schemas.validation.JsonSchema; import org.openapijsonschematools.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; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java index 98e24e61cb1..1335d4863be 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidator.java @@ -1,7 +1,5 @@ package org.openapijsonschematools.schemas.validation; -import org.openapijsonschematools.schemas.JsonSchema; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -11,7 +9,7 @@ public class AdditionalPropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } @@ -39,7 +37,7 @@ public PathToSchemasMap validate(Class cls, Object ar // todo add_deeper_validated_schemas continue; } - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(addPropSchema, propValue, propValidationMetadata); + PathToSchemasMap otherPathToSchemas = JsonSchema.validate(addPropSchema, propValue, propValidationMetadata); pathToSchemas.update(otherPathToSchemas); } return pathToSchemas; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java index 321dc9b5396..c1b1658c07b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FakeValidator.java @@ -2,7 +2,7 @@ public class FakeValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { return null; } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java index 23a2776d945..d57115f6c12 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FormatValidator.java @@ -133,7 +133,7 @@ private Void validateStringFormat(String arg, String format, ValidationMetadata } @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { String format = (String) constraint; if (arg instanceof Number) { validateNumericFormat( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FrozenList.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FrozenList.java similarity index 95% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FrozenList.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FrozenList.java index e9a203d2088..81c09bf1123 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FrozenList.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FrozenList.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import java.util.ArrayList; import java.util.Collection; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FrozenMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FrozenMap.java similarity index 97% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FrozenMap.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FrozenMap.java index 38d03e7ad3b..1076e74f08c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/FrozenMap.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/FrozenMap.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import java.util.LinkedHashMap; import java.util.Map; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java index 82af731d418..34f220b40ea 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java @@ -1,13 +1,11 @@ package org.openapijsonschematools.schemas.validation; -import org.openapijsonschematools.schemas.JsonSchema; - import java.util.ArrayList; import java.util.List; public class ItemsValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof List)) { return null; } @@ -30,7 +28,7 @@ public PathToSchemasMap validate(Class cls, Object ar i +=1; continue; } - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(itemsSchema, itemValue, itemValidationMetadata); + PathToSchemasMap otherPathToSchemas = JsonSchema.validate(itemsSchema, itemValue, itemValidationMetadata); pathToSchemas.update(otherPathToSchemas); i += 1; } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java similarity index 55% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java index f5a871792ff..c988d3d5003 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java @@ -1,16 +1,16 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.validation.SchemaValidator; -import org.openapijsonschematools.schemas.validation.PathToSchemasMap; -import org.openapijsonschematools.schemas.validation.ValidationMetadata; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.Field; import java.time.LocalDate; import java.time.ZonedDateTime; +import java.util.AbstractMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -20,7 +20,112 @@ import java.util.Set; import java.util.UUID; -public abstract class JsonSchema extends SchemaValidator { +public abstract class JsonSchema { + static HashMap keywordToValidator = new HashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry("allOf", new FakeValidator()), + new AbstractMap.SimpleEntry("anyOf", new FakeValidator()), + new AbstractMap.SimpleEntry("const", new FakeValidator()), + new AbstractMap.SimpleEntry("contains", new FakeValidator()), + new AbstractMap.SimpleEntry("default", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentRequired", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentSchemas", new FakeValidator()), + new AbstractMap.SimpleEntry("discriminator", new FakeValidator()), + new AbstractMap.SimpleEntry("enumInfo", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMaximum", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMinimum", new FakeValidator()), + new AbstractMap.SimpleEntry("format", new FormatValidator()), + new AbstractMap.SimpleEntry("if_", new FakeValidator()), + new AbstractMap.SimpleEntry("then", new FakeValidator()), + new AbstractMap.SimpleEntry("else_", new FakeValidator()), + new AbstractMap.SimpleEntry("maxContains", new FakeValidator()), + new AbstractMap.SimpleEntry("maxItems", new FakeValidator()), + new AbstractMap.SimpleEntry("maxLength", new FakeValidator()), + new AbstractMap.SimpleEntry("maxProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("maximum", new FakeValidator()), + new AbstractMap.SimpleEntry("minContains", new FakeValidator()), + new AbstractMap.SimpleEntry("minItems", new FakeValidator()), + new AbstractMap.SimpleEntry("minLength", new FakeValidator()), + new AbstractMap.SimpleEntry("minProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("minimum", new FakeValidator()), + new AbstractMap.SimpleEntry("multipleOf", new FakeValidator()), + new AbstractMap.SimpleEntry("not", new FakeValidator()), + new AbstractMap.SimpleEntry("oneOf", new FakeValidator()), + new AbstractMap.SimpleEntry("pattern", new FakeValidator()), + new AbstractMap.SimpleEntry("patternProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("prefixItems", new FakeValidator()), + new AbstractMap.SimpleEntry("required", new RequiredValidator()), + new AbstractMap.SimpleEntry("type", new TypeValidator()), + new AbstractMap.SimpleEntry("uniqueItems", new FakeValidator()), + new AbstractMap.SimpleEntry("items", new ItemsValidator()), + new AbstractMap.SimpleEntry("unevaluatedItems", new FakeValidator()), + new AbstractMap.SimpleEntry("properties", new PropertiesValidator()), + new AbstractMap.SimpleEntry("propertyNames", new FakeValidator()), + new AbstractMap.SimpleEntry("additionalProperties", new AdditionalPropertiesValidator()), + new AbstractMap.SimpleEntry("unevaluatedProperties", new FakeValidator()) + )); + + protected static PathToSchemasMap validate( + Class schemaCls, + Object arg, + ValidationMetadata validationMetadata + ) { + HashMap fieldsToValues = new HashMap<>(); + LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); + Class usedSchemaCls = schemaCls; + Class superclass = schemaCls.getSuperclass(); + if (superclass != JsonSchema.class) { + // only ref with no adjacent properties supported at this time + usedSchemaCls = (Class) superclass; + } + Field[] fields = usedSchemaCls.getDeclaredFields(); + for (Field field : fields) { + String fieldName = field.getName(); + if (fieldName.equals("keywordToValidator")) { + continue; + } + if (fieldName.equals("this$0")) { + continue; + } + if (disabledKeywords.contains(fieldName)) { + continue; + } + try { + Object value = field.get(null); + fieldsToValues.put(fieldName, value); + } catch (IllegalAccessException | IllegalArgumentException e) { + throw new RuntimeException(e); + } + } + Object extra = null; + PathToSchemasMap pathToSchemas = new PathToSchemasMap(); + for (Map.Entry entry: fieldsToValues.entrySet()) { + String jsonKeyword = entry.getKey(); + Object constraint = entry.getValue(); + if (jsonKeyword.equals("additionalProperties") && fieldsToValues.containsKey("properties")) { + extra = fieldsToValues.get("properties"); + } + KeywordValidator validatorClass = keywordToValidator.get(jsonKeyword); + PathToSchemasMap otherPathToSchemas = validatorClass.validate( + schemaCls, + arg, + constraint, + validationMetadata, + extra + ); + if (otherPathToSchemas == null) { + continue; + } + pathToSchemas.update(otherPathToSchemas); + } + List pathToItem = validationMetadata.pathToItem(); + if (!pathToSchemas.containsKey(pathToItem)) { + pathToSchemas.put(validationMetadata.pathToItem(), new LinkedHashMap<>()); + } + pathToSchemas.get(pathToItem).put(schemaCls, null); + + return pathToSchemas; + } + private static Object castToAllowedTypes(Object arg, List pathToItem, PathToTypeMap pathToType) { if (arg == null) { pathToType.put(pathToItem, Void.class); @@ -89,15 +194,15 @@ private static PathToSchemasMap getPathToSchemas(Class cls } else { PathToSchemasMap otherPathToSchemas = validate(cls, arg, validationMetadata); pathToSchemasMap.update(otherPathToSchemas); - for (LinkedHashMap, Void> schemas: pathToSchemasMap.values()) { - Class firstSchema = schemas.entrySet().iterator().next().getKey(); + for (LinkedHashMap, Void> schemas: pathToSchemasMap.values()) { + Class firstSchema = schemas.entrySet().iterator().next().getKey(); schemas.clear(); schemas.put(firstSchema, null); } Set> missingPaths = new HashSet<>(pathToType.keySet()); missingPaths.removeAll(pathToSchemasMap.keySet()); if (!missingPaths.isEmpty()) { - LinkedHashMap, Void> unsetAnyTypeSchema = new LinkedHashMap<>(); + LinkedHashMap, Void> unsetAnyTypeSchema = new LinkedHashMap<>(); unsetAnyTypeSchema.put(UnsetAnyTypeJsonSchema.class, null); for (List pathToItem: missingPaths) { pathToSchemasMap.put(pathToItem, unsetAnyTypeSchema); @@ -113,7 +218,7 @@ private static FrozenMap getProperties(Map arg, List propertyPathToItem = new ArrayList<>(pathToItem); propertyPathToItem.add(propertyName); - Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); + Class propertyClass = pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); Object value = entry.getValue(); Object castValue = getNewInstance(propertyClass, value, propertyPathToItem, pathToSchemas); properties.put(propertyName, castValue); @@ -127,7 +232,7 @@ private static FrozenList getItems(List arg, List pathToItem, for (Object item: arg) { List itemPathToItem = new ArrayList<>(pathToItem); itemPathToItem.add(i); - Class itemClass = (Class) pathToSchemas.get(itemPathToItem).entrySet().iterator().next().getKey(); + Class itemClass = pathToSchemas.get(itemPathToItem).entrySet().iterator().next().getKey(); Object castItem = getNewInstance(itemClass, item, itemPathToItem, pathToSchemas); items.add(castItem); i += 1; @@ -140,6 +245,8 @@ private static Object getNewInstance(Class cls, Object arg FrozenMap usedArg = getProperties((Map) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getMapOutputInstance", FrozenMap.class); + // needed because this is a protected method, but it is across packages + method.setAccessible(true); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; @@ -150,6 +257,8 @@ private static Object getNewInstance(Class cls, Object arg FrozenList usedArg = getItems((List) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getListOutputInstance", FrozenList.class); + // needed because this is a protected method, but it is across packages + method.setAccessible(true); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; @@ -211,7 +320,7 @@ protected static U validate(Class c // todo add bytes and FileIO - private static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { + public static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { if (arg instanceof Map || arg instanceof List) { // todo don't run validation if the instance is one of the class generic types } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java index c05dc9608fb..e50f737b559 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java @@ -2,7 +2,7 @@ public interface KeywordValidator { PathToSchemasMap validate( - Class cls, + Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java index b9147bcf658..ff038c2605b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.Map; -public class PathToSchemasMap extends LinkedHashMap, LinkedHashMap, Void>> { +public class PathToSchemasMap extends LinkedHashMap, LinkedHashMap, Void>> { public void update(PathToSchemasMap other) { - for (Map.Entry, LinkedHashMap, Void>> entry: other.entrySet()) { + for (Map.Entry, LinkedHashMap, Void>> entry: other.entrySet()) { List pathToItem = entry.getKey(); - LinkedHashMap, Void> otherSchemas = entry.getValue(); + LinkedHashMap, Void> otherSchemas = entry.getValue(); if (containsKey(pathToItem)) { get(pathToItem).putAll(otherSchemas); } else { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/PathToTypeMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToTypeMap.java similarity index 72% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/PathToTypeMap.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToTypeMap.java index 9aba997ddaa..512f30e8052 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/PathToTypeMap.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PathToTypeMap.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import java.util.HashMap; import java.util.List; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java index fe93e31169f..9f3f672323f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java @@ -1,7 +1,5 @@ package org.openapijsonschematools.schemas.validation; -import org.openapijsonschematools.schemas.JsonSchema; - import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -10,7 +8,7 @@ public class PropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } @@ -34,7 +32,7 @@ public PathToSchemasMap validate(Class cls, Object ar // todo add_deeper_validated_schemas continue; } - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(propSchema, propValue, propValidationMetadata); + PathToSchemasMap otherPathToSchemas = JsonSchema.validate(propSchema, propValue, propValidationMetadata); pathToSchemas.update(otherPathToSchemas); } return pathToSchemas; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java index e26b25724a4..a91638d9b21 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java @@ -7,7 +7,7 @@ public class RequiredValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java deleted file mode 100644 index 161874d1953..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/SchemaValidator.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.openapijsonschematools.schemas.validation; - -import org.openapijsonschematools.schemas.JsonSchema; - -import java.lang.reflect.Field; -import java.util.AbstractMap; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -public abstract class SchemaValidator { - static HashMap keywordToValidator = new HashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry("allOf", new FakeValidator()), - new AbstractMap.SimpleEntry("anyOf", new FakeValidator()), - new AbstractMap.SimpleEntry("const", new FakeValidator()), - new AbstractMap.SimpleEntry("contains", new FakeValidator()), - new AbstractMap.SimpleEntry("default", new FakeValidator()), - new AbstractMap.SimpleEntry("dependentRequired", new FakeValidator()), - new AbstractMap.SimpleEntry("dependentSchemas", new FakeValidator()), - new AbstractMap.SimpleEntry("discriminator", new FakeValidator()), - new AbstractMap.SimpleEntry("enumInfo", new FakeValidator()), - new AbstractMap.SimpleEntry("exclusiveMaximum", new FakeValidator()), - new AbstractMap.SimpleEntry("exclusiveMinimum", new FakeValidator()), - new AbstractMap.SimpleEntry("format", new FormatValidator()), - new AbstractMap.SimpleEntry("if_", new FakeValidator()), - new AbstractMap.SimpleEntry("then", new FakeValidator()), - new AbstractMap.SimpleEntry("else_", new FakeValidator()), - new AbstractMap.SimpleEntry("maxContains", new FakeValidator()), - new AbstractMap.SimpleEntry("maxItems", new FakeValidator()), - new AbstractMap.SimpleEntry("maxLength", new FakeValidator()), - new AbstractMap.SimpleEntry("maxProperties", new FakeValidator()), - new AbstractMap.SimpleEntry("maximum", new FakeValidator()), - new AbstractMap.SimpleEntry("minContains", new FakeValidator()), - new AbstractMap.SimpleEntry("minItems", new FakeValidator()), - new AbstractMap.SimpleEntry("minLength", new FakeValidator()), - new AbstractMap.SimpleEntry("minProperties", new FakeValidator()), - new AbstractMap.SimpleEntry("minimum", new FakeValidator()), - new AbstractMap.SimpleEntry("multipleOf", new FakeValidator()), - new AbstractMap.SimpleEntry("not", new FakeValidator()), - new AbstractMap.SimpleEntry("oneOf", new FakeValidator()), - new AbstractMap.SimpleEntry("pattern", new FakeValidator()), - new AbstractMap.SimpleEntry("patternProperties", new FakeValidator()), - new AbstractMap.SimpleEntry("prefixItems", new FakeValidator()), - new AbstractMap.SimpleEntry("required", new RequiredValidator()), - new AbstractMap.SimpleEntry("type", new TypeValidator()), - new AbstractMap.SimpleEntry("uniqueItems", new FakeValidator()), - new AbstractMap.SimpleEntry("items", new ItemsValidator()), - new AbstractMap.SimpleEntry("unevaluatedItems", new FakeValidator()), - new AbstractMap.SimpleEntry("properties", new PropertiesValidator()), - new AbstractMap.SimpleEntry("propertyNames", new FakeValidator()), - new AbstractMap.SimpleEntry("additionalProperties", new AdditionalPropertiesValidator()), - new AbstractMap.SimpleEntry("unevaluatedProperties", new FakeValidator()) - )); - - protected static PathToSchemasMap validate( - Class schemaCls, - Object arg, - ValidationMetadata validationMetadata - ) { - HashMap fieldsToValues = new HashMap<>(); - LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); - Class usedSchemaCls = schemaCls; - Class superclass = schemaCls.getSuperclass(); - if (superclass != JsonSchema.class) { - // only ref with no adjacent properties supported at this time - usedSchemaCls = (Class) superclass; - } - Field[] fields = usedSchemaCls.getDeclaredFields(); - for (Field field : fields) { - String fieldName = field.getName(); - if (fieldName.equals("keywordToValidator")) { - continue; - } - if (fieldName.equals("this$0")) { - continue; - } - if (disabledKeywords.contains(fieldName)) { - continue; - } - try { - Object value = field.get(null); - fieldsToValues.put(fieldName, value); - } catch (IllegalAccessException | IllegalArgumentException e) { - throw new RuntimeException(e); - } - } - Object extra = null; - PathToSchemasMap pathToSchemas = new PathToSchemasMap(); - for (Map.Entry entry: fieldsToValues.entrySet()) { - String jsonKeyword = entry.getKey(); - Object constraint = entry.getValue(); - if (jsonKeyword.equals("additionalProperties") && fieldsToValues.containsKey("properties")) { - extra = fieldsToValues.get("properties"); - } - KeywordValidator validatorClass = keywordToValidator.get(jsonKeyword); - PathToSchemasMap otherPathToSchemas = validatorClass.validate( - schemaCls, - arg, - constraint, - validationMetadata, - extra - ); - if (otherPathToSchemas == null) { - continue; - } - pathToSchemas.update(otherPathToSchemas); - } - Class baseClass; - if (arg == null) { - baseClass = Void.class; - } else { - baseClass = arg.getClass(); - } - List pathToItem = validationMetadata.pathToItem(); - if (!pathToSchemas.containsKey(pathToItem)) { - pathToSchemas.put(validationMetadata.pathToItem(), new LinkedHashMap<>()); - } - pathToSchemas.get(pathToItem).put(baseClass, null); - pathToSchemas.get(pathToItem).put(schemaCls, null); - - return pathToSchemas; - } -} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java index 614da561230..20c4e899585 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java @@ -4,7 +4,7 @@ public class TypeValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { HashSet> types = (HashSet>) constraint; Class argClass; if (arg == null) { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/UnsetAnyTypeJsonSchema.java similarity index 97% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/UnsetAnyTypeJsonSchema.java index 9c5d29eab5b..e7ab09d8b80 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/UnsetAnyTypeJsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/UnsetAnyTypeJsonSchema.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.schemas; +package org.openapijsonschematools.schemas.validation; import org.openapijsonschematools.configurations.SchemaConfiguration; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java index 6974f649156..2ee4adaa3d5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/ValidationMetadata.java @@ -12,8 +12,8 @@ public record ValidationMetadata( Set> seenClasses ) { - public boolean validationRanEarlier(Class cls) { - Map, Void> validatedSchemas = validatedPathToSchemas.getOrDefault(pathToItem, null); + public boolean validationRanEarlier(Class cls) { + Map, Void> validatedSchemas = validatedPathToSchemas.getOrDefault(pathToItem, null); if (validatedSchemas != null && validatedSchemas.containsKey(cls)) { return true; } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/AnyTypeSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/AnyTypeSchemaTest.java index b5439521248..5fea1aebe6d 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/AnyTypeSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/AnyTypeSchemaTest.java @@ -4,6 +4,9 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.FrozenList; +import org.openapijsonschematools.schemas.validation.FrozenMap; + import java.time.LocalDate; import java.time.ZoneId; diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java index 20b4d9a52bf..89e4fdac7a2 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ArrayTypeSchemaTest.java @@ -4,6 +4,8 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -52,7 +54,7 @@ public static ArrayWithOutputClsSchemaList validate(List arg, SchemaConf @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( ArrayWithItemsSchema.class, (Void) null, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/BooleanSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/BooleanSchemaTest.java index 3b1fe8d0cf6..d1ab1fc8e71 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/BooleanSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/BooleanSchemaTest.java @@ -4,6 +4,7 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class BooleanSchemaTest { static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); @@ -22,7 +23,7 @@ public void testValidateFalse() { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( BooleanJsonSchema.class, (Void) null, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ListSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ListSchemaTest.java index 0f11f91a2ad..ee04c1bf160 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ListSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ListSchemaTest.java @@ -4,6 +4,8 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenList; import java.util.ArrayList; import java.util.List; @@ -13,7 +15,7 @@ public class ListSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( ListJsonSchema.class, (Void) null, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/MapSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/MapSchemaTest.java index 5cbdaae0e07..2d64caaad27 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/MapSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/MapSchemaTest.java @@ -4,6 +4,8 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; import java.time.LocalDate; import java.util.LinkedHashMap; @@ -14,7 +16,7 @@ public class MapSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( MapJsonSchema.class, (Void) null, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NullSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NullSchemaTest.java index 2799dcb8ffd..828fe23c5af 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NullSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NullSchemaTest.java @@ -4,6 +4,7 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; public class NullSchemaTest { static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); @@ -16,7 +17,7 @@ public void testValidateNull() { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( NullJsonSchema.class, Boolean.TRUE, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NumberSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NumberSchemaTest.java index 8fd2597e2e4..edbbfa34d15 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NumberSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/NumberSchemaTest.java @@ -4,6 +4,7 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; import java.math.BigDecimal; @@ -36,7 +37,7 @@ public void testValidateDouble() { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( NumberJsonSchema.class, (Void) null, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java index 6295063d94f..94d654fa6a3 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/ObjectTypeSchemaTest.java @@ -4,6 +4,8 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; +import org.openapijsonschematools.schemas.validation.FrozenMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -83,7 +85,7 @@ public static ObjectWithOutputTypeSchemaMap validate(Map arg, Sc @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( ObjectWithPropsSchema.class, (Void) null, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/RefBooleanSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/RefBooleanSchemaTest.java index 2990402f87d..3f3dcdf5e1e 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/RefBooleanSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/RefBooleanSchemaTest.java @@ -4,6 +4,7 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; +import org.openapijsonschematools.schemas.validation.JsonSchema; class RefBooleanSchema { public class RefBooleanSchema1 extends BooleanJsonSchema{} @@ -26,7 +27,7 @@ public void testValidateFalse() { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( RefBooleanSchema.RefBooleanSchema1.class, (Void) null, configuration )); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java index beeaae0c6d2..4b7df25f6e0 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/AdditionalPropertiesValidatorTest.java @@ -4,7 +4,6 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.StringJsonSchema; import java.util.ArrayList; @@ -34,7 +33,7 @@ public void testCorrectPropertySucceeds() { FrozenMap arg = new FrozenMap<>(mutableMap); final AdditionalPropertiesValidator validator = new AdditionalPropertiesValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, @@ -43,8 +42,7 @@ public void testCorrectPropertySucceeds() { List expectedPathToItem = new ArrayList<>(); expectedPathToItem.add("args[0]"); expectedPathToItem.add("someAddProp"); - LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); - expectedClasses.put(String.class, null); + LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); expectedClasses.put(StringJsonSchema.class, null); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); expectedPathToSchemas.put(expectedPathToItem, expectedClasses); @@ -63,7 +61,7 @@ public void testNotApplicableTypeReturnsNull() { ); final AdditionalPropertiesValidator validator = new AdditionalPropertiesValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, StringJsonSchema.class, validationMetadata, @@ -91,7 +89,7 @@ public void testIncorrectPropertyValueFails() { FrozenMap arg = new FrozenMap<>(mutableMap); final AdditionalPropertiesValidator validator = new AdditionalPropertiesValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java index f6eccba4338..c23c4a82e89 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/FormatValidatorTest.java @@ -22,7 +22,7 @@ public class FormatValidatorTest { public void testIntFormatSucceedsWithFloat() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1.0f, "int", validationMetadata, @@ -35,7 +35,7 @@ public void testIntFormatSucceedsWithFloat() { public void testIntFormatFailsWithFloat() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 3.14f, "int", validationMetadata, @@ -47,7 +47,7 @@ public void testIntFormatFailsWithFloat() { public void testIntFormatSucceedsWithInt() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, "int", validationMetadata, @@ -60,7 +60,7 @@ public void testIntFormatSucceedsWithInt() { public void testInt32UnderMinFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, -2147483649L, "int32", validationMetadata, @@ -72,7 +72,7 @@ public void testInt32UnderMinFails() { public void testInt32InclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -2147483648, "int32", validationMetadata, @@ -85,7 +85,7 @@ public void testInt32InclusiveMinSucceeds() { public void testInt32InclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 2147483647, "int32", validationMetadata, @@ -98,7 +98,7 @@ public void testInt32InclusiveMaxSucceeds() { public void testInt32OverMaxFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 2147483648L, "int32", validationMetadata, @@ -111,7 +111,7 @@ public void testInt64UnderMinFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigInteger("-9223372036854775809"), "int64", validationMetadata, @@ -123,7 +123,7 @@ public void testInt64UnderMinFails() { public void testInt64InclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -9223372036854775808L, "int64", validationMetadata, @@ -136,7 +136,7 @@ public void testInt64InclusiveMinSucceeds() { public void testInt64InclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 9223372036854775807L, "int64", validationMetadata, @@ -150,7 +150,7 @@ public void testInt64OverMaxFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigInteger("9223372036854775808"), "int64", validationMetadata, @@ -162,7 +162,7 @@ public void testInt64OverMaxFails() { public void testFloatUnderMinFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, -3.402823466385289e+38d, "float", validationMetadata, @@ -174,7 +174,7 @@ public void testFloatUnderMinFails() { public void testFloatInclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -3.4028234663852886e+38f, "float", validationMetadata, @@ -187,7 +187,7 @@ public void testFloatInclusiveMinSucceeds() { public void testFloatInclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 3.4028234663852886e+38f, "float", validationMetadata, @@ -200,7 +200,7 @@ public void testFloatInclusiveMaxSucceeds() { public void testFloatOverMaxFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 3.402823466385289e+38d, "float", validationMetadata, @@ -212,7 +212,7 @@ public void testFloatOverMaxFails() { public void testDoubleUnderMinFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigDecimal("-1.7976931348623157082e+308"), "double", validationMetadata, @@ -224,7 +224,7 @@ public void testDoubleUnderMinFails() { public void testDoubleInclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -1.7976931348623157E+308d, "double", validationMetadata, @@ -237,7 +237,7 @@ public void testDoubleInclusiveMinSucceeds() { public void testDoubleInclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1.7976931348623157E+308d, "double", validationMetadata, @@ -250,7 +250,7 @@ public void testDoubleInclusiveMaxSucceeds() { public void testDoubleOverMaxFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigDecimal("1.7976931348623157082e+308"), "double", validationMetadata, @@ -262,7 +262,7 @@ public void testDoubleOverMaxFails() { public void testInvalidNumberStringFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, "abc", "number", validationMetadata, @@ -274,7 +274,7 @@ public void testInvalidNumberStringFails() { public void testValidFloatNumberStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "3.14", "number", validationMetadata, @@ -287,7 +287,7 @@ public void testValidFloatNumberStringSucceeds() { public void testValidIntNumberStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "1", "number", validationMetadata, @@ -300,7 +300,7 @@ public void testValidIntNumberStringSucceeds() { public void testInvalidDateStringFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, "abc", "date", validationMetadata, @@ -312,7 +312,7 @@ public void testInvalidDateStringFails() { public void testValidDateStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "2017-01-20", "date", validationMetadata, @@ -325,7 +325,7 @@ public void testValidDateStringSucceeds() { public void testInvalidDateTimeStringFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, "abc", "date-time", validationMetadata, @@ -337,7 +337,7 @@ public void testInvalidDateTimeStringFails() { public void testValidDateTimeStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "2017-07-21T17:32:28Z", "date-time", validationMetadata, diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java index c1ce6bec30b..01affa9489a 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/ItemsValidatorTest.java @@ -4,7 +4,6 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenList; import org.openapijsonschematools.schemas.StringJsonSchema; import java.util.ArrayList; @@ -29,7 +28,7 @@ public void testCorrectItemsSucceeds() { FrozenList arg = new FrozenList<>(mutableList); final ItemsValidator validator = new ItemsValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, @@ -38,8 +37,7 @@ public void testCorrectItemsSucceeds() { List expectedPathToItem = new ArrayList<>(); expectedPathToItem.add("args[0]"); expectedPathToItem.add(0); - LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); - expectedClasses.put(String.class, null); + LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); expectedClasses.put(StringJsonSchema.class, null); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); expectedPathToSchemas.put(expectedPathToItem, expectedClasses); @@ -58,7 +56,7 @@ public void testNotApplicableTypeReturnsNull() { ); final ItemsValidator validator = new ItemsValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, StringJsonSchema.class, validationMetadata, @@ -82,7 +80,7 @@ public void testIncorrectItemFails() { FrozenList arg = new FrozenList<>(mutableList); final ItemsValidator validator = new ItemsValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/JsonSchemaTest.java similarity index 82% rename from samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java rename to samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/JsonSchemaTest.java index ef7736aa7fe..10cfa07211a 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/SchemaValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/JsonSchemaTest.java @@ -11,13 +11,13 @@ import java.util.List; import java.util.Set; -class SomeSchema extends SchemaValidator { +class SomeSchema extends JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); } -public class SchemaValidatorTest { +public class JsonSchemaTest { @Test public void testValidateSucceeds() { @@ -29,15 +29,14 @@ public void testValidateSucceeds() { new PathToSchemasMap(), new LinkedHashSet<>() ); - PathToSchemasMap pathToSchemas = SchemaValidator.validate( + PathToSchemasMap pathToSchemas = JsonSchema.validate( SomeSchema.class, "hi", validationMetadata ); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); - LinkedHashMap, Void> validatedClasses = new LinkedHashMap<>(); + LinkedHashMap, Void> validatedClasses = new LinkedHashMap<>(); validatedClasses.put(SomeSchema.class, null); - validatedClasses.put(String.class, null); expectedPathToSchemas.put(pathToItem, validatedClasses); Assert.assertEquals(pathToSchemas, expectedPathToSchemas); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java index 4d66d8315a4..01e65f19489 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/PropertiesValidatorTest.java @@ -4,7 +4,6 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.StringJsonSchema; import java.util.ArrayList; @@ -33,7 +32,7 @@ public void testCorrectPropertySucceeds() { mutableMap.put("someString", "abc"); FrozenMap arg = new FrozenMap<>(mutableMap); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, properties, validationMetadata, @@ -42,8 +41,7 @@ public void testCorrectPropertySucceeds() { List expectedPathToItem = new ArrayList<>(); expectedPathToItem.add("args[0]"); expectedPathToItem.add("someString"); - LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); - expectedClasses.put(String.class, null); + LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); expectedClasses.put(StringJsonSchema.class, null); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); expectedPathToSchemas.put(expectedPathToItem, expectedClasses); @@ -65,7 +63,7 @@ public void testNotApplicableTypeReturnsNull() { new LinkedHashSet<>() ); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, properties, validationMetadata, @@ -92,7 +90,7 @@ public void testIncorrectPropertyValueFails() { mutableMap.put("someString", 1); FrozenMap arg = new FrozenMap<>(mutableMap); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, properties, validationMetadata, diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java index 860bc6ee767..8c1e0ced9b2 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/RequiredValidatorTest.java @@ -4,7 +4,6 @@ import org.junit.Test; import org.openapijsonschematools.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.configurations.SchemaConfiguration; -import org.openapijsonschematools.schemas.FrozenMap; import org.openapijsonschematools.schemas.StringJsonSchema; import java.util.ArrayList; @@ -34,7 +33,7 @@ public void testCorrectPropertySucceeds() { FrozenMap arg = new FrozenMap<>(mutableMap); final RequiredValidator validator = new RequiredValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, requiredProperties, validationMetadata, @@ -58,7 +57,7 @@ public void testNotApplicableTypeReturnsNull() { ); final RequiredValidator validator = new RequiredValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, properties, validationMetadata, @@ -85,7 +84,7 @@ public void testIncorrectPropertyFails() { FrozenMap arg = new FrozenMap<>(mutableMap); final RequiredValidator validator = new RequiredValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, requiredProperties, validationMetadata, diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java index b496d6ff332..c94a8e0a91d 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/schemas/validation/TypeValidatorTest.java @@ -22,7 +22,7 @@ public void testValidateSucceeds() { new LinkedHashSet<>() ); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "hi", value, validationMetadata, @@ -43,7 +43,7 @@ public void testValidateFailsIntIsNotString() throws RuntimeException { new LinkedHashSet<>() ); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, value, validationMetadata, diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 96d0a9ec0bf..53a799cb90f 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -305,20 +305,15 @@ public void processOpts() { schemaSupportingFiles.add("DecimalJsonSchema"); schemaSupportingFiles.add("DoubleJsonSchema"); schemaSupportingFiles.add("FloatJsonSchema"); - schemaSupportingFiles.add("FrozenList"); - schemaSupportingFiles.add("FrozenMap"); schemaSupportingFiles.add("Int32JsonSchema"); schemaSupportingFiles.add("Int64JsonSchema"); schemaSupportingFiles.add("IntJsonSchema"); - schemaSupportingFiles.add("JsonSchema"); schemaSupportingFiles.add("ListJsonSchema"); schemaSupportingFiles.add("MapJsonSchema"); schemaSupportingFiles.add("NotAnyTypeJsonSchema"); schemaSupportingFiles.add("NullJsonSchema"); schemaSupportingFiles.add("NumberJsonSchema"); - schemaSupportingFiles.add("PathToTypeMap"); schemaSupportingFiles.add("StringJsonSchema"); - schemaSupportingFiles.add("UnsetAnyTypeJsonSchema"); schemaSupportingFiles.add("UuidJsonSchema"); for (String schemaSupportingFile: schemaSupportingFiles) { supportingFiles.add(new SupportingFile( @@ -350,13 +345,17 @@ public void processOpts() { keywordValidatorFiles.add("CustomIsoparser"); keywordValidatorFiles.add("FakeValidator"); keywordValidatorFiles.add("FormatValidator"); + keywordValidatorFiles.add("FrozenList"); + keywordValidatorFiles.add("FrozenMap"); keywordValidatorFiles.add("ItemsValidator"); + keywordValidatorFiles.add("JsonSchema"); keywordValidatorFiles.add("KeywordValidator"); keywordValidatorFiles.add("PathToSchemasMap"); + keywordValidatorFiles.add("PathToTypeMap"); // todo change this to set keywordValidatorFiles.add("PropertiesValidator"); keywordValidatorFiles.add("RequiredValidator"); - keywordValidatorFiles.add("SchemaValidator"); keywordValidatorFiles.add("TypeValidator"); + keywordValidatorFiles.add("UnsetAnyTypeJsonSchema"); keywordValidatorFiles.add("ValidationMetadata"); for (String keywordValidatorFile: keywordValidatorFiles) { supportingFiles.add(new SupportingFile( @@ -373,7 +372,7 @@ public void processOpts() { keywordValidatorTestFiles.add("PropertiesValidatorTest"); keywordValidatorTestFiles.add("RequiredValidatorTest"); keywordValidatorTestFiles.add("TypeValidatorTest"); - keywordValidatorTestFiles.add("SchemaValidatorTest"); + keywordValidatorTestFiles.add("JsonSchemaTest"); for (String keywordValidatorTestFile: keywordValidatorTestFiles) { supportingFiles.add(new SupportingFile( "src/test/java/org/openapitools/schemas/validation/"+keywordValidatorTestFile+".hbs", @@ -1179,8 +1178,7 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu if (schema.isSimpleBoolean()) { imports.add("import "+packageName + ".schemas.BooleanJsonSchema;"); } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); imports.add("import java.util.LinkedHashSet;"); imports.add("import java.util.Set;"); } @@ -1188,8 +1186,7 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu if (schema.isSimpleNull()) { imports.add("import "+packageName + ".schemas.NullJsonSchema;"); } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); imports.add("import java.util.LinkedHashSet;"); imports.add("import java.util.Set;"); } @@ -1203,8 +1200,7 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu imports.add("import "+packageName + ".schemas.Int64JsonSchema;"); } } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); imports.add("import java.util.LinkedHashSet;"); imports.add("import java.util.Set;"); } @@ -1222,8 +1218,7 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu imports.add("import "+packageName + ".schemas.DoubleJsonSchema;"); } } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); imports.add("import java.util.LinkedHashSet;"); imports.add("import java.util.Set;"); } @@ -1244,11 +1239,10 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu imports.add("import "+packageName + ".schemas.StringJsonSchema;"); } else if (schema.format.equals("binary")) { // todo implement this - imports.add("import "+packageName + ".schemas.JsonSchema;"); + imports.add("import "+packageName + ".schemas.validation.JsonSchema;"); } } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); imports.add("import java.util.LinkedHashSet;"); imports.add("import java.util.Set;"); addStringSchemaImports(imports, schema); @@ -1257,8 +1251,7 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu if (schema.isSimpleObject()) { imports.add("import "+packageName + ".schemas.MapJsonSchema;"); } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); imports.add("import java.util.LinkedHashSet;"); imports.add("import java.util.Set;"); addMapSchemaImports(imports, schema); @@ -1267,16 +1260,14 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu if (schema.isSimpleArray()) { imports.add("import "+packageName + ".schemas.ListJsonSchema;"); } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); 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;"); + addCustomSchemaImports(imports); imports.add("import java.util.LinkedHashSet;"); imports.add("import java.util.Set;"); if (schema.types.contains("string")) { @@ -1298,14 +1289,13 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu } else if (schema.isSimpleAnyType()) { imports.add("import "+packageName + ".schemas.AnyTypeJsonSchema;"); } else { - imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); - imports.add("import "+packageName + ".schemas.JsonSchema;"); + addCustomSchemaImports(imports); 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 "+packageName + ".schemas.validation.FrozenList;"); imports.add("import java.util.List;"); - imports.add("import "+packageName + ".schemas.FrozenMap;"); + imports.add("import "+packageName + ".schemas.validation.FrozenMap;"); imports.add("import java.util.Map;"); if (schema.properties != null) { imports.add("import java.util.Map;"); @@ -1321,8 +1311,14 @@ public Set getImports(String sourceJsonPath, CodegenSchema schema, Featu return imports; } + private void addCustomSchemaImports(Set imports) { + imports.add("import "+packageName + ".configurations.SchemaConfiguration;"); + imports.add("import "+packageName + ".schemas.validation.JsonSchema;"); + } + + private void addMapSchemaImports(Set imports, CodegenSchema schema) { - imports.add("import "+packageName + ".schemas.FrozenMap;"); + imports.add("import "+packageName + ".schemas.validation.FrozenMap;"); imports.add("import java.util.Map;"); if (schema.properties != null) { imports.add("import java.util.Map;"); @@ -1336,7 +1332,7 @@ private void addMapSchemaImports(Set imports, CodegenSchema schema) { } private void addListSchemaImports(Set imports, CodegenSchema schema) { - imports.add("import "+packageName + ".schemas.FrozenList;"); + imports.add("import "+packageName + ".schemas.validation.FrozenList;"); imports.add("import java.util.List;"); } 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 13767356591..bcd8e32a5d5 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 @@ -1,5 +1,8 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; +import {{{packageName}}}.schemas.validation.FrozenMap; +import {{{packageName}}}.schemas.validation.FrozenList; import {{{packageName}}}.configurations.SchemaConfiguration; import java.time.LocalDate; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs index eb6a79b713f..dcd36d6f758 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/BooleanJsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class BooleanJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs index 9f54c869efb..bb488e303f9 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateJsonSchema.hbs @@ -1,14 +1,11 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class DateJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs index d38bc958863..9b189f2a424 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DateTimeJsonSchema.hbs @@ -1,14 +1,11 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class DateTimeJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs index 69b43c2b673..a07a7299288 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DecimalJsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class DecimalJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs index bd7900e0778..41e8b40369c 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/DoubleJsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class DoubleJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs index 2527ae04306..762a11b4bb6 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/FloatJsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class FloatJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs index 122a508529c..dc7ca32f0e3 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int32JsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class Int32JsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs index c07f3b8531d..a4e6f280c32 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/Int64JsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class Int64JsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs index 0c0b0302a32..ee518b61b87 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/IntJsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class IntJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs index c7cf7cad343..71e577b15e5 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/ListJsonSchema.hbs @@ -1,14 +1,12 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.FrozenList; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class ListJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs index 0b3315e5217..f4f4acff018 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/MapJsonSchema.hbs @@ -1,14 +1,12 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.FrozenMap; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class MapJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs index 2acfe7429e6..a9e3770250e 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/NotAnyTypeJsonSchema.hbs @@ -1,14 +1,6 @@ package {{{packageName}}}.schemas; -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; +import {{{packageName}}}.schemas.validation.JsonSchema; public class NotAnyTypeJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs index aa9ff6a1bde..8da6cf651cf 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/NullJsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class NullJsonSchema extends JsonSchema { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs index 4d61b41d16f..07ffe7b26ae 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/NumberJsonSchema.hbs @@ -1,14 +1,10 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; public class NumberJsonSchema extends JsonSchema { 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 2b3997e26f5..0f8bc980f31 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 @@ -1,12 +1,11 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs index b315b377c07..d1480d42432 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/UuidJsonSchema.hbs @@ -1,12 +1,9 @@ package {{{packageName}}}.schemas; +import {{{packageName}}}.schemas.validation.JsonSchema; 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; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/AdditionalPropertiesValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/AdditionalPropertiesValidator.hbs index fc65d846e9f..070e0da5679 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/AdditionalPropertiesValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/AdditionalPropertiesValidator.hbs @@ -1,7 +1,5 @@ package {{{packageName}}}.schemas.validation; -import {{{packageName}}}.schemas.JsonSchema; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -11,7 +9,7 @@ import java.util.Set; public class AdditionalPropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } @@ -39,7 +37,7 @@ public class AdditionalPropertiesValidator implements KeywordValidator { // todo add_deeper_validated_schemas continue; } - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(addPropSchema, propValue, propValidationMetadata); + PathToSchemasMap otherPathToSchemas = JsonSchema.validate(addPropSchema, propValue, propValidationMetadata); pathToSchemas.update(otherPathToSchemas); } return pathToSchemas; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs index 321dc9b5396..c1b1658c07b 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FakeValidator.hbs @@ -2,7 +2,7 @@ package org.openapijsonschematools.schemas.validation; public class FakeValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { return null; } } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FormatValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FormatValidator.hbs index 675f95f70b2..ca67981cc0a 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FormatValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FormatValidator.hbs @@ -133,7 +133,7 @@ public class FormatValidator implements KeywordValidator { } @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { String format = (String) constraint; if (arg instanceof Number) { validateNumericFormat( diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/FrozenList.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FrozenList.hbs similarity index 96% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/FrozenList.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FrozenList.hbs index dbc75da7932..ded2345d16e 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/FrozenList.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FrozenList.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/FrozenMap.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FrozenMap.hbs similarity index 98% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/FrozenMap.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FrozenMap.hbs index 291d6005197..f1cf2bc7cc4 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/FrozenMap.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/FrozenMap.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ItemsValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ItemsValidator.hbs index 16de36e1a0f..7f44cb4e30a 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ItemsValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ItemsValidator.hbs @@ -1,13 +1,11 @@ package {{{packageName}}}.schemas.validation; -import {{{packageName}}}.schemas.JsonSchema; - import java.util.ArrayList; import java.util.List; public class ItemsValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof List)) { return null; } @@ -30,7 +28,7 @@ public class ItemsValidator implements KeywordValidator { i +=1; continue; } - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(itemsSchema, itemValue, itemValidationMetadata); + PathToSchemasMap otherPathToSchemas = JsonSchema.validate(itemsSchema, itemValue, itemValidationMetadata); pathToSchemas.update(otherPathToSchemas); i += 1; } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/JsonSchema.hbs similarity index 55% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/JsonSchema.hbs index 177e1699767..a1582b0413f 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/JsonSchema.hbs @@ -1,16 +1,16 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.schemas.validation.SchemaValidator; -import {{{packageName}}}.schemas.validation.PathToSchemasMap; -import {{{packageName}}}.schemas.validation.ValidationMetadata; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.Field; import java.time.LocalDate; import java.time.ZonedDateTime; +import java.util.AbstractMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -20,7 +20,112 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -public abstract class JsonSchema extends SchemaValidator { +public abstract class JsonSchema { + static HashMap keywordToValidator = new HashMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry("allOf", new FakeValidator()), + new AbstractMap.SimpleEntry("anyOf", new FakeValidator()), + new AbstractMap.SimpleEntry("const", new FakeValidator()), + new AbstractMap.SimpleEntry("contains", new FakeValidator()), + new AbstractMap.SimpleEntry("default", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentRequired", new FakeValidator()), + new AbstractMap.SimpleEntry("dependentSchemas", new FakeValidator()), + new AbstractMap.SimpleEntry("discriminator", new FakeValidator()), + new AbstractMap.SimpleEntry("enumInfo", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMaximum", new FakeValidator()), + new AbstractMap.SimpleEntry("exclusiveMinimum", new FakeValidator()), + new AbstractMap.SimpleEntry("format", new FormatValidator()), + new AbstractMap.SimpleEntry("if_", new FakeValidator()), + new AbstractMap.SimpleEntry("then", new FakeValidator()), + new AbstractMap.SimpleEntry("else_", new FakeValidator()), + new AbstractMap.SimpleEntry("maxContains", new FakeValidator()), + new AbstractMap.SimpleEntry("maxItems", new FakeValidator()), + new AbstractMap.SimpleEntry("maxLength", new FakeValidator()), + new AbstractMap.SimpleEntry("maxProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("maximum", new FakeValidator()), + new AbstractMap.SimpleEntry("minContains", new FakeValidator()), + new AbstractMap.SimpleEntry("minItems", new FakeValidator()), + new AbstractMap.SimpleEntry("minLength", new FakeValidator()), + new AbstractMap.SimpleEntry("minProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("minimum", new FakeValidator()), + new AbstractMap.SimpleEntry("multipleOf", new FakeValidator()), + new AbstractMap.SimpleEntry("not", new FakeValidator()), + new AbstractMap.SimpleEntry("oneOf", new FakeValidator()), + new AbstractMap.SimpleEntry("pattern", new FakeValidator()), + new AbstractMap.SimpleEntry("patternProperties", new FakeValidator()), + new AbstractMap.SimpleEntry("prefixItems", new FakeValidator()), + new AbstractMap.SimpleEntry("required", new RequiredValidator()), + new AbstractMap.SimpleEntry("type", new TypeValidator()), + new AbstractMap.SimpleEntry("uniqueItems", new FakeValidator()), + new AbstractMap.SimpleEntry("items", new ItemsValidator()), + new AbstractMap.SimpleEntry("unevaluatedItems", new FakeValidator()), + new AbstractMap.SimpleEntry("properties", new PropertiesValidator()), + new AbstractMap.SimpleEntry("propertyNames", new FakeValidator()), + new AbstractMap.SimpleEntry("additionalProperties", new AdditionalPropertiesValidator()), + new AbstractMap.SimpleEntry("unevaluatedProperties", new FakeValidator()) + )); + + protected static PathToSchemasMap validate( + Class schemaCls, + Object arg, + ValidationMetadata validationMetadata + ) { + HashMap fieldsToValues = new HashMap<>(); + LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); + Class usedSchemaCls = schemaCls; + Class superclass = schemaCls.getSuperclass(); + if (superclass != JsonSchema.class) { + // only ref with no adjacent properties supported at this time + usedSchemaCls = (Class) superclass; + } + Field[] fields = usedSchemaCls.getDeclaredFields(); + for (Field field : fields) { + String fieldName = field.getName(); + if (fieldName.equals("keywordToValidator")) { + continue; + } + if (fieldName.equals("this$0")) { + continue; + } + if (disabledKeywords.contains(fieldName)) { + continue; + } + try { + Object value = field.get(null); + fieldsToValues.put(fieldName, value); + } catch (IllegalAccessException | IllegalArgumentException e) { + throw new RuntimeException(e); + } + } + Object extra = null; + PathToSchemasMap pathToSchemas = new PathToSchemasMap(); + for (Map.Entry entry: fieldsToValues.entrySet()) { + String jsonKeyword = entry.getKey(); + Object constraint = entry.getValue(); + if (jsonKeyword.equals("additionalProperties") && fieldsToValues.containsKey("properties")) { + extra = fieldsToValues.get("properties"); + } + KeywordValidator validatorClass = keywordToValidator.get(jsonKeyword); + PathToSchemasMap otherPathToSchemas = validatorClass.validate( + schemaCls, + arg, + constraint, + validationMetadata, + extra + ); + if (otherPathToSchemas == null) { + continue; + } + pathToSchemas.update(otherPathToSchemas); + } + List pathToItem = validationMetadata.pathToItem(); + if (!pathToSchemas.containsKey(pathToItem)) { + pathToSchemas.put(validationMetadata.pathToItem(), new LinkedHashMap<>()); + } + pathToSchemas.get(pathToItem).put(schemaCls, null); + + return pathToSchemas; + } + private static Object castToAllowedTypes(Object arg, List pathToItem, PathToTypeMap pathToType) { if (arg == null) { pathToType.put(pathToItem, Void.class); @@ -89,15 +194,15 @@ public abstract class JsonSchema extends SchemaValidator { } else { PathToSchemasMap otherPathToSchemas = validate(cls, arg, validationMetadata); pathToSchemasMap.update(otherPathToSchemas); - for (LinkedHashMap, Void> schemas: pathToSchemasMap.values()) { - Class firstSchema = schemas.entrySet().iterator().next().getKey(); + for (LinkedHashMap, Void> schemas: pathToSchemasMap.values()) { + Class firstSchema = schemas.entrySet().iterator().next().getKey(); schemas.clear(); schemas.put(firstSchema, null); } Set> missingPaths = new HashSet<>(pathToType.keySet()); missingPaths.removeAll(pathToSchemasMap.keySet()); if (!missingPaths.isEmpty()) { - LinkedHashMap, Void> unsetAnyTypeSchema = new LinkedHashMap<>(); + LinkedHashMap, Void> unsetAnyTypeSchema = new LinkedHashMap<>(); unsetAnyTypeSchema.put(UnsetAnyTypeJsonSchema.class, null); for (List pathToItem: missingPaths) { pathToSchemasMap.put(pathToItem, unsetAnyTypeSchema); @@ -113,7 +218,7 @@ public abstract class JsonSchema extends SchemaValidator { String propertyName = (String) entry.getKey(); List propertyPathToItem = new ArrayList<>(pathToItem); propertyPathToItem.add(propertyName); - Class propertyClass = (Class) pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); + Class propertyClass = pathToSchemas.get(propertyPathToItem).entrySet().iterator().next().getKey(); Object value = entry.getValue(); Object castValue = getNewInstance(propertyClass, value, propertyPathToItem, pathToSchemas); properties.put(propertyName, castValue); @@ -127,7 +232,7 @@ public abstract class JsonSchema extends SchemaValidator { for (Object item: arg) { List itemPathToItem = new ArrayList<>(pathToItem); itemPathToItem.add(i); - Class itemClass = (Class) pathToSchemas.get(itemPathToItem).entrySet().iterator().next().getKey(); + Class itemClass = pathToSchemas.get(itemPathToItem).entrySet().iterator().next().getKey(); Object castItem = getNewInstance(itemClass, item, itemPathToItem, pathToSchemas); items.add(castItem); i += 1; @@ -140,6 +245,8 @@ public abstract class JsonSchema extends SchemaValidator { FrozenMap usedArg = getProperties((Map) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getMapOutputInstance", FrozenMap.class); + // needed because this is a protected method, but it is across packages + method.setAccessible(true); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; @@ -150,6 +257,8 @@ public abstract class JsonSchema extends SchemaValidator { FrozenList usedArg = getItems((List) arg, pathToItem, pathToSchemas); try { Method method = cls.getDeclaredMethod("getListOutputInstance", FrozenList.class); + // needed because this is a protected method, but it is across packages + method.setAccessible(true); return method.invoke(null, usedArg); } catch (NoSuchMethodException e) { return usedArg; @@ -211,7 +320,7 @@ public abstract class JsonSchema extends SchemaValidator { // todo add bytes and FileIO - private static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { + public static Object validateObject(Class cls, Object arg, SchemaConfiguration configuration) { if (arg instanceof Map || arg instanceof List) { // todo don't run validation if the instance is one of the class generic types } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs index aac5ef86ec0..4df90b7ad06 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/KeywordValidator.hbs @@ -2,7 +2,7 @@ package {{{packageName}}}.schemas.validation; public interface KeywordValidator { PathToSchemasMap validate( - Class cls, + Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToSchemasMap.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToSchemasMap.hbs index 79148f93611..b287ed57ae6 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToSchemasMap.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToSchemasMap.hbs @@ -4,12 +4,12 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public class PathToSchemasMap extends LinkedHashMap, LinkedHashMap, Void>> { +public class PathToSchemasMap extends LinkedHashMap, LinkedHashMap, Void>> { public void update(PathToSchemasMap other) { - for (Map.Entry, LinkedHashMap, Void>> entry: other.entrySet()) { + for (Map.Entry, LinkedHashMap, Void>> entry: other.entrySet()) { List pathToItem = entry.getKey(); - LinkedHashMap, Void> otherSchemas = entry.getValue(); + LinkedHashMap, Void> otherSchemas = entry.getValue(); if (containsKey(pathToItem)) { get(pathToItem).putAll(otherSchemas); } else { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/PathToTypeMap.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToTypeMap.hbs similarity index 75% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/PathToTypeMap.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToTypeMap.hbs index d16c7f5fe9c..4eaa7bd96c5 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/PathToTypeMap.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToTypeMap.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import java.util.HashMap; import java.util.List; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PropertiesValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PropertiesValidator.hbs index 2f1c2957226..4f8f4499a69 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PropertiesValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PropertiesValidator.hbs @@ -1,7 +1,5 @@ package {{{packageName}}}.schemas.validation; -import {{{packageName}}}.schemas.JsonSchema; - import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -10,7 +8,7 @@ import java.util.Set; public class PropertiesValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } @@ -34,7 +32,7 @@ public class PropertiesValidator implements KeywordValidator { // todo add_deeper_validated_schemas continue; } - PathToSchemasMap otherPathToSchemas = SchemaValidator.validate(propSchema, propValue, propValidationMetadata); + PathToSchemasMap otherPathToSchemas = JsonSchema.validate(propSchema, propValue, propValidationMetadata); pathToSchemas.update(otherPathToSchemas); } return pathToSchemas; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/RequiredValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/RequiredValidator.hbs index e26b25724a4..a91638d9b21 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/RequiredValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/RequiredValidator.hbs @@ -7,7 +7,7 @@ import java.util.Set; public class RequiredValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { if (!(arg instanceof Map)) { return null; } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs deleted file mode 100644 index bf70f8e87fe..00000000000 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/SchemaValidator.hbs +++ /dev/null @@ -1,125 +0,0 @@ -package {{{packageName}}}.schemas.validation; - -import {{{packageName}}}.schemas.JsonSchema; - -import java.lang.reflect.Field; -import java.util.AbstractMap; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -public abstract class SchemaValidator { - static HashMap keywordToValidator = new HashMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry("allOf", new FakeValidator()), - new AbstractMap.SimpleEntry("anyOf", new FakeValidator()), - new AbstractMap.SimpleEntry("const", new FakeValidator()), - new AbstractMap.SimpleEntry("contains", new FakeValidator()), - new AbstractMap.SimpleEntry("default", new FakeValidator()), - new AbstractMap.SimpleEntry("dependentRequired", new FakeValidator()), - new AbstractMap.SimpleEntry("dependentSchemas", new FakeValidator()), - new AbstractMap.SimpleEntry("discriminator", new FakeValidator()), - new AbstractMap.SimpleEntry("enumInfo", new FakeValidator()), - new AbstractMap.SimpleEntry("exclusiveMaximum", new FakeValidator()), - new AbstractMap.SimpleEntry("exclusiveMinimum", new FakeValidator()), - new AbstractMap.SimpleEntry("format", new FormatValidator()), - new AbstractMap.SimpleEntry("if_", new FakeValidator()), - new AbstractMap.SimpleEntry("then", new FakeValidator()), - new AbstractMap.SimpleEntry("else_", new FakeValidator()), - new AbstractMap.SimpleEntry("maxContains", new FakeValidator()), - new AbstractMap.SimpleEntry("maxItems", new FakeValidator()), - new AbstractMap.SimpleEntry("maxLength", new FakeValidator()), - new AbstractMap.SimpleEntry("maxProperties", new FakeValidator()), - new AbstractMap.SimpleEntry("maximum", new FakeValidator()), - new AbstractMap.SimpleEntry("minContains", new FakeValidator()), - new AbstractMap.SimpleEntry("minItems", new FakeValidator()), - new AbstractMap.SimpleEntry("minLength", new FakeValidator()), - new AbstractMap.SimpleEntry("minProperties", new FakeValidator()), - new AbstractMap.SimpleEntry("minimum", new FakeValidator()), - new AbstractMap.SimpleEntry("multipleOf", new FakeValidator()), - new AbstractMap.SimpleEntry("not", new FakeValidator()), - new AbstractMap.SimpleEntry("oneOf", new FakeValidator()), - new AbstractMap.SimpleEntry("pattern", new FakeValidator()), - new AbstractMap.SimpleEntry("patternProperties", new FakeValidator()), - new AbstractMap.SimpleEntry("prefixItems", new FakeValidator()), - new AbstractMap.SimpleEntry("required", new RequiredValidator()), - new AbstractMap.SimpleEntry("type", new TypeValidator()), - new AbstractMap.SimpleEntry("uniqueItems", new FakeValidator()), - new AbstractMap.SimpleEntry("items", new ItemsValidator()), - new AbstractMap.SimpleEntry("unevaluatedItems", new FakeValidator()), - new AbstractMap.SimpleEntry("properties", new PropertiesValidator()), - new AbstractMap.SimpleEntry("propertyNames", new FakeValidator()), - new AbstractMap.SimpleEntry("additionalProperties", new AdditionalPropertiesValidator()), - new AbstractMap.SimpleEntry("unevaluatedProperties", new FakeValidator()) - )); - - protected static PathToSchemasMap validate( - Class schemaCls, - Object arg, - ValidationMetadata validationMetadata - ) { - HashMap fieldsToValues = new HashMap<>(); - LinkedHashSet disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords(); - Class usedSchemaCls = schemaCls; - Class superclass = schemaCls.getSuperclass(); - if (superclass != JsonSchema.class) { - // only ref with no adjacent properties supported at this time - usedSchemaCls = (Class) superclass; - } - Field[] fields = usedSchemaCls.getDeclaredFields(); - for (Field field : fields) { - String fieldName = field.getName(); - if (fieldName.equals("keywordToValidator")) { - continue; - } - if (fieldName.equals("this$0")) { - continue; - } - if (disabledKeywords.contains(fieldName)) { - continue; - } - try { - Object value = field.get(null); - fieldsToValues.put(fieldName, value); - } catch (IllegalAccessException | IllegalArgumentException e) { - throw new RuntimeException(e); - } - } - Object extra = null; - PathToSchemasMap pathToSchemas = new PathToSchemasMap(); - for (Map.Entry entry: fieldsToValues.entrySet()) { - String jsonKeyword = entry.getKey(); - Object constraint = entry.getValue(); - if (jsonKeyword.equals("additionalProperties") && fieldsToValues.containsKey("properties")) { - extra = fieldsToValues.get("properties"); - } - KeywordValidator validatorClass = keywordToValidator.get(jsonKeyword); - PathToSchemasMap otherPathToSchemas = validatorClass.validate( - schemaCls, - arg, - constraint, - validationMetadata, - extra - ); - if (otherPathToSchemas == null) { - continue; - } - pathToSchemas.update(otherPathToSchemas); - } - Class baseClass; - if (arg == null) { - baseClass = Void.class; - } else { - baseClass = arg.getClass(); - } - List pathToItem = validationMetadata.pathToItem(); - if (!pathToSchemas.containsKey(pathToItem)) { - pathToSchemas.put(validationMetadata.pathToItem(), new LinkedHashMap<>()); - } - pathToSchemas.get(pathToItem).put(baseClass, null); - pathToSchemas.get(pathToItem).put(schemaCls, null); - - return pathToSchemas; - } -} diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/TypeValidator.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/TypeValidator.hbs index c4b80b06318..5d9a8de90b2 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/TypeValidator.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/TypeValidator.hbs @@ -4,7 +4,7 @@ import java.util.HashSet; public class TypeValidator implements KeywordValidator { @Override - public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { + public PathToSchemasMap validate(Class cls, Object arg, Object constraint, ValidationMetadata validationMetadata, Object extra) { HashSet> types = (HashSet>) constraint; Class argClass; if (arg == null) { diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/UnsetAnyTypeJsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/UnsetAnyTypeJsonSchema.hbs similarity index 97% rename from src/main/resources/java/src/main/java/org/openapitools/schemas/UnsetAnyTypeJsonSchema.hbs rename to src/main/resources/java/src/main/java/org/openapitools/schemas/validation/UnsetAnyTypeJsonSchema.hbs index dfa289b79cb..3c062e4ed79 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/UnsetAnyTypeJsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/UnsetAnyTypeJsonSchema.hbs @@ -1,4 +1,4 @@ -package {{{packageName}}}.schemas; +package {{{packageName}}}.schemas.validation; import {{{packageName}}}.configurations.SchemaConfiguration; diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ValidationMetadata.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ValidationMetadata.hbs index e5499f29ec2..e0b06e46fc1 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ValidationMetadata.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/ValidationMetadata.hbs @@ -12,8 +12,8 @@ public record ValidationMetadata( Set> seenClasses ) { - public boolean validationRanEarlier(Class cls) { - Map, Void> validatedSchemas = validatedPathToSchemas.getOrDefault(pathToItem, null); + public boolean validationRanEarlier(Class cls) { + Map, Void> validatedSchemas = validatedPathToSchemas.getOrDefault(pathToItem, null); if (validatedSchemas != null && validatedSchemas.containsKey(cls)) { return true; } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/AnyTypeSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/AnyTypeSchemaTest.hbs index 69864c0b8ef..1303417561f 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/AnyTypeSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/AnyTypeSchemaTest.hbs @@ -4,6 +4,9 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.FrozenList; +import {{{packageName}}}.schemas.validation.FrozenMap; + import java.time.LocalDate; import java.time.ZoneId; diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs index 65ed4044e6d..a35e62a23fb 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/ArrayTypeSchemaTest.hbs @@ -4,6 +4,8 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; +import {{{packageName}}}.schemas.validation.FrozenList; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -52,7 +54,7 @@ public class ArrayTypeSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( ArrayWithItemsSchema.class, (Void) null, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/BooleanSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/BooleanSchemaTest.hbs index 6032b2cc6ab..c3626d6b8be 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/BooleanSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/BooleanSchemaTest.hbs @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; public class BooleanSchemaTest { static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); @@ -22,7 +23,7 @@ public class BooleanSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( BooleanJsonSchema.class, (Void) null, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/ListSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/ListSchemaTest.hbs index 8a3b71dc2ef..357df065371 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/ListSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/ListSchemaTest.hbs @@ -4,6 +4,8 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; +import {{{packageName}}}.schemas.validation.FrozenList; import java.util.ArrayList; import java.util.List; @@ -13,7 +15,7 @@ public class ListSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( ListJsonSchema.class, (Void) null, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/MapSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/MapSchemaTest.hbs index 136868abced..4aaea8c50e6 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/MapSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/MapSchemaTest.hbs @@ -4,6 +4,8 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; +import {{{packageName}}}.schemas.validation.FrozenMap; import java.time.LocalDate; import java.util.LinkedHashMap; @@ -14,7 +16,7 @@ public class MapSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( MapJsonSchema.class, (Void) null, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/NullSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/NullSchemaTest.hbs index 9a9c140868b..0c18606ff64 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/NullSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/NullSchemaTest.hbs @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; public class NullSchemaTest { static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); @@ -16,7 +17,7 @@ public class NullSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( NullJsonSchema.class, Boolean.TRUE, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/NumberSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/NumberSchemaTest.hbs index 861f99bf016..9049d954cea 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/NumberSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/NumberSchemaTest.hbs @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; import java.math.BigDecimal; @@ -36,7 +37,7 @@ public class NumberSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( NumberJsonSchema.class, (Void) null, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs index 28fca714612..4bbece9ef85 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/ObjectTypeSchemaTest.hbs @@ -4,6 +4,8 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; +import {{{packageName}}}.schemas.validation.FrozenMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -83,7 +85,7 @@ public class ObjectTypeSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( ObjectWithPropsSchema.class, (Void) null, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/RefBooleanSchemaTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/RefBooleanSchemaTest.hbs index 88ddee9e70e..b1807a9a045 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/RefBooleanSchemaTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/RefBooleanSchemaTest.hbs @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; +import {{{packageName}}}.schemas.validation.JsonSchema; class RefBooleanSchema { public class RefBooleanSchema1 extends BooleanJsonSchema{} @@ -26,7 +27,7 @@ public class RefBooleanSchemaTest { @Test public void testExceptionThrownForInvalidType() { - Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validate( + Assert.assertThrows(RuntimeException.class, () -> JsonSchema.validateObject( RefBooleanSchema.RefBooleanSchema1.class, (Void) null, configuration )); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/AdditionalPropertiesValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/AdditionalPropertiesValidatorTest.hbs index 2b96c164cc3..2a74f29eabd 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/AdditionalPropertiesValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/AdditionalPropertiesValidatorTest.hbs @@ -4,7 +4,6 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.schemas.FrozenMap; import {{{packageName}}}.schemas.StringJsonSchema; import java.util.ArrayList; @@ -34,7 +33,7 @@ public class AdditionalPropertiesValidatorTest { FrozenMap arg = new FrozenMap<>(mutableMap); final AdditionalPropertiesValidator validator = new AdditionalPropertiesValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, @@ -43,8 +42,7 @@ public class AdditionalPropertiesValidatorTest { List expectedPathToItem = new ArrayList<>(); expectedPathToItem.add("args[0]"); expectedPathToItem.add("someAddProp"); - LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); - expectedClasses.put(String.class, null); + LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); expectedClasses.put(StringJsonSchema.class, null); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); expectedPathToSchemas.put(expectedPathToItem, expectedClasses); @@ -63,7 +61,7 @@ public class AdditionalPropertiesValidatorTest { ); final AdditionalPropertiesValidator validator = new AdditionalPropertiesValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, StringJsonSchema.class, validationMetadata, @@ -91,7 +89,7 @@ public class AdditionalPropertiesValidatorTest { FrozenMap arg = new FrozenMap<>(mutableMap); final AdditionalPropertiesValidator validator = new AdditionalPropertiesValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/FormatValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/FormatValidatorTest.hbs index cbc9a30cd03..62902eb935d 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/FormatValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/FormatValidatorTest.hbs @@ -22,7 +22,7 @@ public class FormatValidatorTest { public void testIntFormatSucceedsWithFloat() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1.0f, "int", validationMetadata, @@ -35,7 +35,7 @@ public class FormatValidatorTest { public void testIntFormatFailsWithFloat() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 3.14f, "int", validationMetadata, @@ -47,7 +47,7 @@ public class FormatValidatorTest { public void testIntFormatSucceedsWithInt() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, "int", validationMetadata, @@ -60,7 +60,7 @@ public class FormatValidatorTest { public void testInt32UnderMinFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, -2147483649L, "int32", validationMetadata, @@ -72,7 +72,7 @@ public class FormatValidatorTest { public void testInt32InclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -2147483648, "int32", validationMetadata, @@ -85,7 +85,7 @@ public class FormatValidatorTest { public void testInt32InclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 2147483647, "int32", validationMetadata, @@ -98,7 +98,7 @@ public class FormatValidatorTest { public void testInt32OverMaxFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 2147483648L, "int32", validationMetadata, @@ -111,7 +111,7 @@ public class FormatValidatorTest { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigInteger("-9223372036854775809"), "int64", validationMetadata, @@ -123,7 +123,7 @@ public class FormatValidatorTest { public void testInt64InclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -9223372036854775808L, "int64", validationMetadata, @@ -136,7 +136,7 @@ public class FormatValidatorTest { public void testInt64InclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 9223372036854775807L, "int64", validationMetadata, @@ -150,7 +150,7 @@ public class FormatValidatorTest { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigInteger("9223372036854775808"), "int64", validationMetadata, @@ -162,7 +162,7 @@ public class FormatValidatorTest { public void testFloatUnderMinFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, -3.402823466385289e+38d, "float", validationMetadata, @@ -174,7 +174,7 @@ public class FormatValidatorTest { public void testFloatInclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -3.4028234663852886e+38f, "float", validationMetadata, @@ -187,7 +187,7 @@ public class FormatValidatorTest { public void testFloatInclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 3.4028234663852886e+38f, "float", validationMetadata, @@ -200,7 +200,7 @@ public class FormatValidatorTest { public void testFloatOverMaxFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 3.402823466385289e+38d, "float", validationMetadata, @@ -212,7 +212,7 @@ public class FormatValidatorTest { public void testDoubleUnderMinFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigDecimal("-1.7976931348623157082e+308"), "double", validationMetadata, @@ -224,7 +224,7 @@ public class FormatValidatorTest { public void testDoubleInclusiveMinSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, -1.7976931348623157E+308d, "double", validationMetadata, @@ -237,7 +237,7 @@ public class FormatValidatorTest { public void testDoubleInclusiveMaxSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1.7976931348623157E+308d, "double", validationMetadata, @@ -250,7 +250,7 @@ public class FormatValidatorTest { public void testDoubleOverMaxFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, new BigDecimal("1.7976931348623157082e+308"), "double", validationMetadata, @@ -262,7 +262,7 @@ public class FormatValidatorTest { public void testInvalidNumberStringFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, "abc", "number", validationMetadata, @@ -274,7 +274,7 @@ public class FormatValidatorTest { public void testValidFloatNumberStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "3.14", "number", validationMetadata, @@ -287,7 +287,7 @@ public class FormatValidatorTest { public void testValidIntNumberStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "1", "number", validationMetadata, @@ -300,7 +300,7 @@ public class FormatValidatorTest { public void testInvalidDateStringFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, "abc", "date", validationMetadata, @@ -312,7 +312,7 @@ public class FormatValidatorTest { public void testValidDateStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "2017-01-20", "date", validationMetadata, @@ -325,7 +325,7 @@ public class FormatValidatorTest { public void testInvalidDateTimeStringFails() { final FormatValidator validator = new FormatValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, "abc", "date-time", validationMetadata, @@ -337,7 +337,7 @@ public class FormatValidatorTest { public void testValidDateTimeStringSucceeds() { final FormatValidator validator = new FormatValidator(); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "2017-07-21T17:32:28Z", "date-time", validationMetadata, diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/ItemsValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/ItemsValidatorTest.hbs index f31afbe7cc1..662cdf8983a 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/ItemsValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/ItemsValidatorTest.hbs @@ -4,7 +4,6 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.schemas.FrozenList; import {{{packageName}}}.schemas.StringJsonSchema; import java.util.ArrayList; @@ -29,7 +28,7 @@ public class ItemsValidatorTest { FrozenList arg = new FrozenList<>(mutableList); final ItemsValidator validator = new ItemsValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, @@ -38,8 +37,7 @@ public class ItemsValidatorTest { List expectedPathToItem = new ArrayList<>(); expectedPathToItem.add("args[0]"); expectedPathToItem.add(0); - LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); - expectedClasses.put(String.class, null); + LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); expectedClasses.put(StringJsonSchema.class, null); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); expectedPathToSchemas.put(expectedPathToItem, expectedClasses); @@ -58,7 +56,7 @@ public class ItemsValidatorTest { ); final ItemsValidator validator = new ItemsValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, StringJsonSchema.class, validationMetadata, @@ -82,7 +80,7 @@ public class ItemsValidatorTest { FrozenList arg = new FrozenList<>(mutableList); final ItemsValidator validator = new ItemsValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, StringJsonSchema.class, validationMetadata, diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/SchemaValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/JsonSchemaTest.hbs similarity index 81% rename from src/main/resources/java/src/test/java/org/openapitools/schemas/validation/SchemaValidatorTest.hbs rename to src/main/resources/java/src/test/java/org/openapitools/schemas/validation/JsonSchemaTest.hbs index c6b6eb2bf3e..e40530799a7 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/SchemaValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/JsonSchemaTest.hbs @@ -11,13 +11,13 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -class SomeSchema extends SchemaValidator { +class SomeSchema extends JsonSchema { static final LinkedHashSet> type = new LinkedHashSet<>(Set.of( String.class )); } -public class SchemaValidatorTest { +public class JsonSchemaTest { @Test public void testValidateSucceeds() { @@ -29,15 +29,14 @@ public class SchemaValidatorTest { new PathToSchemasMap(), new LinkedHashSet<>() ); - PathToSchemasMap pathToSchemas = SchemaValidator.validate( + PathToSchemasMap pathToSchemas = JsonSchema.validate( SomeSchema.class, "hi", validationMetadata ); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); - LinkedHashMap, Void> validatedClasses = new LinkedHashMap<>(); + LinkedHashMap, Void> validatedClasses = new LinkedHashMap<>(); validatedClasses.put(SomeSchema.class, null); - validatedClasses.put(String.class, null); expectedPathToSchemas.put(pathToItem, validatedClasses); Assert.assertEquals(pathToSchemas, expectedPathToSchemas); } diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/PropertiesValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/PropertiesValidatorTest.hbs index c08046178b2..05ff78cf928 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/PropertiesValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/PropertiesValidatorTest.hbs @@ -4,7 +4,6 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.schemas.FrozenMap; import {{{packageName}}}.schemas.StringJsonSchema; import java.util.ArrayList; @@ -33,7 +32,7 @@ public class PropertiesValidatorTest { mutableMap.put("someString", "abc"); FrozenMap arg = new FrozenMap<>(mutableMap); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, properties, validationMetadata, @@ -42,8 +41,7 @@ public class PropertiesValidatorTest { List expectedPathToItem = new ArrayList<>(); expectedPathToItem.add("args[0]"); expectedPathToItem.add("someString"); - LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); - expectedClasses.put(String.class, null); + LinkedHashMap, Void> expectedClasses = new LinkedHashMap<>(); expectedClasses.put(StringJsonSchema.class, null); PathToSchemasMap expectedPathToSchemas = new PathToSchemasMap(); expectedPathToSchemas.put(expectedPathToItem, expectedClasses); @@ -65,7 +63,7 @@ public class PropertiesValidatorTest { new LinkedHashSet<>() ); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, properties, validationMetadata, @@ -92,7 +90,7 @@ public class PropertiesValidatorTest { mutableMap.put("someString", 1); FrozenMap arg = new FrozenMap<>(mutableMap); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, properties, validationMetadata, diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/RequiredValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/RequiredValidatorTest.hbs index 1ad4f0cae5b..1d25e0ceee5 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/RequiredValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/RequiredValidatorTest.hbs @@ -4,7 +4,6 @@ import org.junit.Assert; import org.junit.Test; import {{{packageName}}}.configurations.JsonSchemaKeywordFlags; import {{{packageName}}}.configurations.SchemaConfiguration; -import {{{packageName}}}.schemas.FrozenMap; import {{{packageName}}}.schemas.StringJsonSchema; import java.util.ArrayList; @@ -34,7 +33,7 @@ public class RequiredValidatorTest { FrozenMap arg = new FrozenMap<>(mutableMap); final RequiredValidator validator = new RequiredValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, requiredProperties, validationMetadata, @@ -58,7 +57,7 @@ public class RequiredValidatorTest { ); final RequiredValidator validator = new RequiredValidator(); PathToSchemasMap pathToSchemas = validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, properties, validationMetadata, @@ -85,7 +84,7 @@ public class RequiredValidatorTest { FrozenMap arg = new FrozenMap<>(mutableMap); final RequiredValidator validator = new RequiredValidator(); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, arg, requiredProperties, validationMetadata, diff --git a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/TypeValidatorTest.hbs b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/TypeValidatorTest.hbs index 555afad4155..98e0a17a7e2 100644 --- a/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/TypeValidatorTest.hbs +++ b/src/main/resources/java/src/test/java/org/openapitools/schemas/validation/TypeValidatorTest.hbs @@ -22,7 +22,7 @@ public class TypeValidatorTest { new LinkedHashSet<>() ); PathToSchemasMap pathToSchemasMap = validator.validate( - SchemaValidator.class, + JsonSchema.class, "hi", value, validationMetadata, @@ -43,7 +43,7 @@ public class TypeValidatorTest { new LinkedHashSet<>() ); Assert.assertThrows(RuntimeException.class, () -> validator.validate( - SchemaValidator.class, + JsonSchema.class, 1, value, validationMetadata, From 8c49c7dfa78bbca83ac6e85401ce9a184e29bc7c Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 20 Nov 2023 13:30:44 -0800 Subject: [PATCH 13/15] Replaces path to type with pathSet --- .../petstore/java/.openapi-generator/FILES | 1 - .../schemas/validation/JsonSchema.java | 40 +++++++++---------- .../generators/JavaClientGenerator.java | 1 - .../schemas/validation/JsonSchema.hbs | 40 +++++++++---------- .../schemas/validation/PathToTypeMap.hbs | 8 ---- 5 files changed, 40 insertions(+), 50 deletions(-) delete mode 100644 src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToTypeMap.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index 8388dd58d2c..de22fa8674e 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -368,7 +368,6 @@ src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java -src/main/java/org/openapijsonschematools/schemas/validation/PathToTypeMap.java src/main/java/org/openapijsonschematools/schemas/validation/PropertiesValidator.java src/main/java/org/openapijsonschematools/schemas/validation/RequiredValidator.java src/main/java/org/openapijsonschematools/schemas/validation/TypeValidator.java diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java index c988d3d5003..817f0496d0b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java @@ -126,60 +126,60 @@ protected static PathToSchemasMap validate( return pathToSchemas; } - private static Object castToAllowedTypes(Object arg, List pathToItem, PathToTypeMap pathToType) { + private static Object castToAllowedTypes(Object arg, List pathToItem, Set> pathSet) { if (arg == null) { - pathToType.put(pathToItem, Void.class); + pathSet.add(pathToItem); return null; } else if (arg instanceof String) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Map) { - pathToType.put(pathToItem, Map.class); + pathSet.add(pathToItem); LinkedHashMap argFixed = new LinkedHashMap<>(); for (Map.Entry entry: ((Map) arg).entrySet()) { String key = (String) entry.getKey(); Object val = entry.getValue(); List newPathToItem = new ArrayList<>(pathToItem); newPathToItem.add(key); - Object fixedVal = castToAllowedTypes(val, newPathToItem, pathToType); + Object fixedVal = castToAllowedTypes(val, newPathToItem, pathSet); argFixed.put(key, fixedVal); } return new FrozenMap<>(argFixed); } else if (arg instanceof Boolean) { - pathToType.put(pathToItem, Boolean.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Integer) { - pathToType.put(pathToItem, Integer.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Long) { - pathToType.put(pathToItem, Long.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Float) { - pathToType.put(pathToItem, Float.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Double) { - pathToType.put(pathToItem, Double.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof List) { - pathToType.put(pathToItem, FrozenList.class); + pathSet.add(pathToItem); List argFixed = new ArrayList<>(); int i =0; for (Object item: ((List) arg).toArray()) { List newPathToItem = new ArrayList<>(pathToItem); newPathToItem.add(i); - Object fixedVal = castToAllowedTypes(item, newPathToItem, pathToType); + Object fixedVal = castToAllowedTypes(item, newPathToItem, pathSet); argFixed.add(fixedVal); i += 1; } return new FrozenList<>(argFixed); } else if (arg instanceof ZonedDateTime) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg.toString(); } else if (arg instanceof LocalDate) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg.toString(); } else if (arg instanceof UUID) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg.toString(); } else { Class argClass = arg.getClass(); @@ -187,7 +187,7 @@ private static Object castToAllowedTypes(Object arg, List pathToItem, Pa } } - private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, PathToTypeMap pathToType) { + private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, Set> pathSet) { PathToSchemasMap pathToSchemasMap = new PathToSchemasMap(); if (validationMetadata.validationRanEarlier(cls)) { // todo add deeper validated schemas @@ -199,7 +199,7 @@ private static PathToSchemasMap getPathToSchemas(Class cls schemas.clear(); schemas.put(firstSchema, null); } - Set> missingPaths = new HashSet<>(pathToType.keySet()); + Set> missingPaths = pathSet; missingPaths.removeAll(pathToSchemasMap.keySet()); if (!missingPaths.isEmpty()) { LinkedHashMap, Void> unsetAnyTypeSchema = new LinkedHashMap<>(); @@ -324,10 +324,10 @@ public static Object validateObject(Class cls, Object arg, if (arg instanceof Map || arg instanceof List) { // todo don't run validation if the instance is one of the class generic types } - PathToTypeMap pathToType = new PathToTypeMap(); + Set> pathSet = new HashSet(); List pathToItem = new ArrayList<>(); pathToItem.add("args[0]"); - Object castArg = castToAllowedTypes(arg, pathToItem, pathToType); + Object castArg = castToAllowedTypes(arg, pathToItem, pathSet); SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone())); PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap(); ValidationMetadata validationMetadata = new ValidationMetadata( @@ -336,7 +336,7 @@ public static Object validateObject(Class cls, Object arg, validatedPathToSchemas, new LinkedHashSet<>() ); - PathToSchemasMap pathToSchemasMap = getPathToSchemas(cls, castArg, validationMetadata, pathToType); + PathToSchemasMap pathToSchemasMap = getPathToSchemas(cls, castArg, validationMetadata, pathSet); return getNewInstance(cls, castArg, validationMetadata.pathToItem(), pathToSchemasMap); } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 53a799cb90f..48adbc0421d 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -351,7 +351,6 @@ public void processOpts() { keywordValidatorFiles.add("JsonSchema"); keywordValidatorFiles.add("KeywordValidator"); keywordValidatorFiles.add("PathToSchemasMap"); - keywordValidatorFiles.add("PathToTypeMap"); // todo change this to set keywordValidatorFiles.add("PropertiesValidator"); keywordValidatorFiles.add("RequiredValidator"); keywordValidatorFiles.add("TypeValidator"); diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/JsonSchema.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/JsonSchema.hbs index a1582b0413f..473fe3a6915 100644 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/JsonSchema.hbs +++ b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/JsonSchema.hbs @@ -126,60 +126,60 @@ public abstract class JsonSchema { return pathToSchemas; } - private static Object castToAllowedTypes(Object arg, List pathToItem, PathToTypeMap pathToType) { + private static Object castToAllowedTypes(Object arg, List pathToItem, Set> pathSet) { if (arg == null) { - pathToType.put(pathToItem, Void.class); + pathSet.add(pathToItem); return null; } else if (arg instanceof String) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Map) { - pathToType.put(pathToItem, Map.class); + pathSet.add(pathToItem); LinkedHashMap argFixed = new LinkedHashMap<>(); for (Map.Entry entry: ((Map) arg).entrySet()) { String key = (String) entry.getKey(); Object val = entry.getValue(); List newPathToItem = new ArrayList<>(pathToItem); newPathToItem.add(key); - Object fixedVal = castToAllowedTypes(val, newPathToItem, pathToType); + Object fixedVal = castToAllowedTypes(val, newPathToItem, pathSet); argFixed.put(key, fixedVal); } return new FrozenMap<>(argFixed); } else if (arg instanceof Boolean) { - pathToType.put(pathToItem, Boolean.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Integer) { - pathToType.put(pathToItem, Integer.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Long) { - pathToType.put(pathToItem, Long.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Float) { - pathToType.put(pathToItem, Float.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof Double) { - pathToType.put(pathToItem, Double.class); + pathSet.add(pathToItem); return arg; } else if (arg instanceof List) { - pathToType.put(pathToItem, FrozenList.class); + pathSet.add(pathToItem); List argFixed = new ArrayList<>(); int i =0; for (Object item: ((List) arg).toArray()) { List newPathToItem = new ArrayList<>(pathToItem); newPathToItem.add(i); - Object fixedVal = castToAllowedTypes(item, newPathToItem, pathToType); + Object fixedVal = castToAllowedTypes(item, newPathToItem, pathSet); argFixed.add(fixedVal); i += 1; } return new FrozenList<>(argFixed); } else if (arg instanceof ZonedDateTime) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg.toString(); } else if (arg instanceof LocalDate) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg.toString(); } else if (arg instanceof UUID) { - pathToType.put(pathToItem, String.class); + pathSet.add(pathToItem); return arg.toString(); } else { Class argClass = arg.getClass(); @@ -187,7 +187,7 @@ public abstract class JsonSchema { } } - private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, PathToTypeMap pathToType) { + private static PathToSchemasMap getPathToSchemas(Class cls, Object arg, ValidationMetadata validationMetadata, Set> pathSet) { PathToSchemasMap pathToSchemasMap = new PathToSchemasMap(); if (validationMetadata.validationRanEarlier(cls)) { // todo add deeper validated schemas @@ -199,7 +199,7 @@ public abstract class JsonSchema { schemas.clear(); schemas.put(firstSchema, null); } - Set> missingPaths = new HashSet<>(pathToType.keySet()); + Set> missingPaths = pathSet; missingPaths.removeAll(pathToSchemasMap.keySet()); if (!missingPaths.isEmpty()) { LinkedHashMap, Void> unsetAnyTypeSchema = new LinkedHashMap<>(); @@ -324,10 +324,10 @@ public abstract class JsonSchema { if (arg instanceof Map || arg instanceof List) { // todo don't run validation if the instance is one of the class generic types } - PathToTypeMap pathToType = new PathToTypeMap(); + Set> pathSet = new HashSet(); List pathToItem = new ArrayList<>(); pathToItem.add("args[0]"); - Object castArg = castToAllowedTypes(arg, pathToItem, pathToType); + Object castArg = castToAllowedTypes(arg, pathToItem, pathSet); SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone())); PathToSchemasMap validatedPathToSchemas = new PathToSchemasMap(); ValidationMetadata validationMetadata = new ValidationMetadata( @@ -336,7 +336,7 @@ public abstract class JsonSchema { validatedPathToSchemas, new LinkedHashSet<>() ); - PathToSchemasMap pathToSchemasMap = getPathToSchemas(cls, castArg, validationMetadata, pathToType); + PathToSchemasMap pathToSchemasMap = getPathToSchemas(cls, castArg, validationMetadata, pathSet); return getNewInstance(cls, castArg, validationMetadata.pathToItem(), pathToSchemasMap); } diff --git a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToTypeMap.hbs b/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToTypeMap.hbs deleted file mode 100644 index 4eaa7bd96c5..00000000000 --- a/src/main/resources/java/src/main/java/org/openapitools/schemas/validation/PathToTypeMap.hbs +++ /dev/null @@ -1,8 +0,0 @@ -package {{{packageName}}}.schemas.validation; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class PathToTypeMap extends HashMap, Class> { -} \ No newline at end of file From 463d6d175cee8c07944b7d9c81a5d781107bdff7 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 20 Nov 2023 13:37:19 -0800 Subject: [PATCH 14/15] Has type object validate method return output type class --- .../responses/headerswithnobody/Headers.java | 2 +- .../successinlinecontentandheader/Headers.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../successwithjsonapiresponse/Headers.java | 2 +- .../components/schemas/AbstractStepMessage.java | 2 +- .../schemas/AdditionalPropertiesClass.java | 14 +++++++------- .../schemas/AdditionalPropertiesValidator.java | 6 +++--- .../AdditionalPropertiesWithArrayOfEnums.java | 2 +- .../components/schemas/Address.java | 2 +- .../components/schemas/Animal.java | 2 +- .../components/schemas/AnyTypeAndFormat.java | 2 +- .../components/schemas/ApiResponseSchema.java | 2 +- .../components/schemas/Apple.java | 2 +- .../components/schemas/AppleReq.java | 2 +- .../schemas/ArrayOfArrayOfNumberOnly.java | 2 +- .../components/schemas/ArrayOfNumberOnly.java | 2 +- .../components/schemas/ArrayTest.java | 2 +- .../components/schemas/Banana.java | 2 +- .../components/schemas/BananaReq.java | 2 +- .../components/schemas/BasquePig.java | 2 +- .../components/schemas/Capitalization.java | 2 +- .../components/schemas/Cat.java | 2 +- .../components/schemas/Category.java | 2 +- .../components/schemas/ChildCat.java | 2 +- .../components/schemas/Client.java | 2 +- .../components/schemas/ComplexQuadrilateral.java | 2 +- .../components/schemas/DanishPig.java | 2 +- .../components/schemas/Dog.java | 2 +- .../components/schemas/Drawing.java | 2 +- .../components/schemas/EnumArrays.java | 2 +- .../components/schemas/EnumTest.java | 2 +- .../components/schemas/EquilateralTriangle.java | 2 +- .../components/schemas/File.java | 2 +- .../components/schemas/FileSchemaTestClass.java | 2 +- .../components/schemas/Foo.java | 2 +- .../components/schemas/FormatTest.java | 2 +- .../components/schemas/FromSchema.java | 2 +- .../components/schemas/GrandparentAnimal.java | 2 +- .../components/schemas/HasOnlyReadOnly.java | 2 +- .../components/schemas/HealthCheckResult.java | 2 +- .../components/schemas/IsoscelesTriangle.java | 2 +- .../schemas/JSONPatchRequestAddReplaceTest.java | 2 +- .../schemas/JSONPatchRequestMoveCopy.java | 2 +- .../components/schemas/JSONPatchRequestRemove.java | 2 +- .../components/schemas/MapTest.java | 10 +++++----- ...ixedPropertiesAndAdditionalPropertiesClass.java | 4 ++-- .../components/schemas/Money.java | 2 +- .../components/schemas/MyObjectDto.java | 2 +- .../components/schemas/NoAdditionalProperties.java | 2 +- .../components/schemas/NullableClass.java | 8 ++++---- .../components/schemas/NumberOnly.java | 2 +- .../components/schemas/ObjWithRequiredProps.java | 2 +- .../schemas/ObjWithRequiredPropsBase.java | 2 +- .../ObjectModelWithArgAndArgsProperties.java | 2 +- .../schemas/ObjectModelWithRefProps.java | 2 +- ...ctWithAllOfWithReqTestPropFromUnsetAddProp.java | 2 +- .../schemas/ObjectWithCollidingProperties.java | 2 +- .../schemas/ObjectWithDecimalProperties.java | 2 +- .../schemas/ObjectWithDifficultlyNamedProps.java | 2 +- .../ObjectWithInlineCompositionProperty.java | 2 +- .../ObjectWithInvalidNamedRefedProperties.java | 2 +- .../schemas/ObjectWithNonIntersectingValues.java | 2 +- .../schemas/ObjectWithOnlyOptionalProps.java | 2 +- .../schemas/ObjectWithOptionalTestProp.java | 2 +- .../components/schemas/Order.java | 2 +- .../schemas/PaginatedResultMyObjectDto.java | 2 +- .../components/schemas/Pet.java | 2 +- .../components/schemas/Player.java | 2 +- .../components/schemas/PublicKey.java | 2 +- .../components/schemas/ReadOnlyFirst.java | 2 +- .../schemas/ReqPropsFromExplicitAddProps.java | 2 +- .../schemas/ReqPropsFromTrueAddProps.java | 2 +- .../schemas/ReqPropsFromUnsetAddProps.java | 2 +- .../components/schemas/ScaleneTriangle.java | 2 +- .../schemas/SelfReferencingObjectModel.java | 2 +- .../components/schemas/SimpleQuadrilateral.java | 2 +- .../components/schemas/SpecialModelname.java | 2 +- .../components/schemas/StringBooleanMap.java | 2 +- .../components/schemas/Tag.java | 2 +- .../components/schemas/User.java | 2 +- .../components/schemas/Whale.java | 2 +- .../components/schemas/Zebra.java | 2 +- .../commonparamsubdir/delete/HeaderParameters.java | 2 +- .../commonparamsubdir/delete/PathParameters.java | 2 +- .../commonparamsubdir/get/PathParameters.java | 2 +- .../commonparamsubdir/get/QueryParameters.java | 2 +- .../commonparamsubdir/post/HeaderParameters.java | 2 +- .../commonparamsubdir/post/PathParameters.java | 2 +- .../paths/fake/delete/HeaderParameters.java | 2 +- .../paths/fake/delete/QueryParameters.java | 2 +- .../paths/fake/get/HeaderParameters.java | 2 +- .../paths/fake/get/QueryParameters.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../put/QueryParameters.java | 2 +- .../put/QueryParameters.java | 2 +- .../fakedeletecoffeeid/delete/PathParameters.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../post/QueryParameters.java | 2 +- .../post/parameters/parameter1/Schema1.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../paths/fakeobjinquery/get/QueryParameters.java | 2 +- .../get/parameters/parameter0/Schema0.java | 2 +- .../post/CookieParameters.java | 2 +- .../post/HeaderParameters.java | 2 +- .../post/PathParameters.java | 2 +- .../post/QueryParameters.java | 2 +- .../post/PathParameters.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../get/QueryParameters.java | 2 +- .../fakerefobjinquery/get/QueryParameters.java | 2 +- .../put/QueryParameters.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../content/applicationjson/Schema.java | 2 +- .../paths/petfindbystatus/get/QueryParameters.java | 2 +- .../paths/petfindbytags/get/QueryParameters.java | 2 +- .../paths/petpetid/delete/HeaderParameters.java | 2 +- .../paths/petpetid/delete/PathParameters.java | 2 +- .../paths/petpetid/get/PathParameters.java | 2 +- .../paths/petpetid/post/PathParameters.java | 2 +- .../applicationxwwwformurlencoded/Schema.java | 2 +- .../petpetiduploadimage/post/PathParameters.java | 2 +- .../content/multipartformdata/Schema.java | 2 +- .../storeorderorderid/delete/PathParameters.java | 2 +- .../storeorderorderid/get/PathParameters.java | 2 +- .../paths/userlogin/get/QueryParameters.java | 2 +- .../get/responses/response200/Headers.java | 2 +- .../paths/userusername/delete/PathParameters.java | 2 +- .../paths/userusername/get/PathParameters.java | 2 +- .../paths/userusername/put/PathParameters.java | 2 +- .../components/schemas/SchemaClass/_validate.hbs | 6 ++++++ 136 files changed, 157 insertions(+), 151 deletions(-) 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 25f492dcf1d..b25ed601ac4 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 @@ -39,7 +39,7 @@ public class Headers1 extends JsonSchema { protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeadersMap 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/successinlinecontentandheader/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java index ea7f46661d8..b3f4a5d7c0d 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 @@ -39,7 +39,7 @@ public class Headers1 extends JsonSchema { protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeadersMap 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/successinlinecontentandheader/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java index cfd7de80c1a..189fc2e23ed 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 @@ -31,7 +31,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } 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 52728f3b3a3..b37f4f7459b 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 @@ -52,7 +52,7 @@ public class Headers1 extends JsonSchema { protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeadersMap 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/schemas/AbstractStepMessage.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java index d540ede9372..04c5a159346 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 @@ -48,7 +48,7 @@ public class AbstractStepMessage1 extends JsonSchema { protected static AbstractStepMessageMap getMapOutputInstance(FrozenMap arg) { return new AbstractStepMessageMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AbstractStepMessageMap 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 ec184029876..71f66d598d0 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 @@ -36,7 +36,7 @@ public class MapProperty extends JsonSchema { protected static MapPropertyMap getMapOutputInstance(FrozenMap arg) { return new MapPropertyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapPropertyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapProperty.class, arg, configuration); } } @@ -62,7 +62,7 @@ public class AdditionalProperties1 extends JsonSchema { protected static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AdditionalPropertiesMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties1.class, arg, configuration); } } @@ -85,7 +85,7 @@ public class MapOfMapProperty extends JsonSchema { protected static MapOfMapPropertyMap getMapOutputInstance(FrozenMap arg) { return new MapOfMapPropertyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapOfMapPropertyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapOfMapProperty.class, arg, configuration); } } @@ -120,7 +120,7 @@ public class MapWithUndeclaredPropertiesAnytype3 extends JsonSchema { protected static MapWithUndeclaredPropertiesAnytype3Map getMapOutputInstance(FrozenMap arg) { return new MapWithUndeclaredPropertiesAnytype3Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapWithUndeclaredPropertiesAnytype3Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapWithUndeclaredPropertiesAnytype3.class, arg, configuration); } } @@ -148,7 +148,7 @@ public class EmptyMap extends JsonSchema { protected static EmptyMapMap getMapOutputInstance(FrozenMap arg) { return new EmptyMapMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static EmptyMapMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(EmptyMap.class, arg, configuration); } } @@ -174,7 +174,7 @@ public class MapWithUndeclaredPropertiesString extends JsonSchema { protected static MapWithUndeclaredPropertiesStringMap getMapOutputInstance(FrozenMap arg) { return new MapWithUndeclaredPropertiesStringMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapWithUndeclaredPropertiesStringMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapWithUndeclaredPropertiesString.class, arg, configuration); } } @@ -212,7 +212,7 @@ public class AdditionalPropertiesClass1 extends JsonSchema { protected static AdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesClassMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AdditionalPropertiesClassMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalPropertiesClass1.class, arg, configuration); } } 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 7e890d8ec05..183bbbdf337 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 @@ -36,7 +36,7 @@ public class Schema0 extends JsonSchema { protected static Schema0Map getMapOutputInstance(FrozenMap arg) { return new Schema0Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema0Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema0.class, arg, configuration); } } @@ -109,7 +109,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } @@ -182,7 +182,7 @@ public class Schema2 extends JsonSchema { protected static Schema2Map getMapOutputInstance(FrozenMap arg) { return new Schema2Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema2Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema2.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 3ab72edc4d4..9289f65344b 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 @@ -54,7 +54,7 @@ public class AdditionalPropertiesWithArrayOfEnums1 extends JsonSchema { protected static AdditionalPropertiesWithArrayOfEnumsMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesWithArrayOfEnumsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AdditionalPropertiesWithArrayOfEnumsMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalPropertiesWithArrayOfEnums1.class, arg, configuration); } } 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 83f875e4272..1a3588ffde4 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 @@ -37,7 +37,7 @@ public class Address1 extends JsonSchema { protected static AddressMap getMapOutputInstance(FrozenMap arg) { return new AddressMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AddressMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Address1.class, arg, configuration); } } 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 17d089cccdd..6f2e074bc8d 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 @@ -54,7 +54,7 @@ public class Animal1 extends JsonSchema { protected static AnimalMap getMapOutputInstance(FrozenMap arg) { return new AnimalMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AnimalMap 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/AnyTypeAndFormat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/AnyTypeAndFormat.java index b24223796d3..41821317116 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 @@ -509,7 +509,7 @@ public class AnyTypeAndFormat1 extends JsonSchema { protected static AnyTypeAndFormatMap getMapOutputInstance(FrozenMap arg) { return new AnyTypeAndFormatMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AnyTypeAndFormatMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnyTypeAndFormat1.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 76e5af85c58..b00c7194b8c 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 @@ -50,7 +50,7 @@ public class ApiResponseSchema1 extends JsonSchema { protected static ApiResponseMap getMapOutputInstance(FrozenMap arg) { return new ApiResponseMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ApiResponseMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ApiResponseSchema1.class, arg, configuration); } } 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 c1c00280bcb..b8b5e33a600 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 @@ -60,7 +60,7 @@ public class Apple1 extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(Apple1.class, arg, configuration); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AppleMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Apple1.class, arg, 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 43f828c2c8f..193d8fd2774 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 @@ -56,7 +56,7 @@ public class AppleReq1 extends JsonSchema { protected static AppleReqMap getMapOutputInstance(FrozenMap arg) { return new AppleReqMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AppleReqMap 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/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ArrayOfArrayOfNumberOnly.java index 7ac63828892..9a25f3ecb77 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 @@ -81,7 +81,7 @@ public class ArrayOfArrayOfNumberOnly1 extends JsonSchema { protected static ArrayOfArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new ArrayOfArrayOfNumberOnlyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ArrayOfArrayOfNumberOnlyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfArrayOfNumberOnly1.class, arg, configuration); } } 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 ddc8cad9cc3..85f5bee73fe 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 @@ -62,7 +62,7 @@ public class ArrayOfNumberOnly1 extends JsonSchema { protected static ArrayOfNumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new ArrayOfNumberOnlyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ArrayOfNumberOnlyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfNumberOnly1.class, arg, configuration); } } 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 dbb8abc352c..cff7824a4c4 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 @@ -144,7 +144,7 @@ public class ArrayTest1 extends JsonSchema { protected static ArrayTestMap getMapOutputInstance(FrozenMap arg) { return new ArrayTestMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ArrayTestMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayTest1.class, arg, configuration); } } 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 a2f68be589c..fad9bd91db5 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 @@ -44,7 +44,7 @@ public class Banana1 extends JsonSchema { protected static BananaMap getMapOutputInstance(FrozenMap arg) { return new BananaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static BananaMap 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 47057f0bb72..3c2ff2cdaa0 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 @@ -56,7 +56,7 @@ public class BananaReq1 extends JsonSchema { protected static BananaReqMap getMapOutputInstance(FrozenMap arg) { return new BananaReqMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static BananaReqMap 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/BasquePig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/BasquePig.java index 220bb98d01c..ded1d9b85e8 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 @@ -49,7 +49,7 @@ public class BasquePig1 extends JsonSchema { protected static BasquePigMap getMapOutputInstance(FrozenMap arg) { return new BasquePigMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static BasquePigMap 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/Capitalization.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Capitalization.java index 17e28da8451..eb29e09a263 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 @@ -61,7 +61,7 @@ public class Capitalization1 extends JsonSchema { protected static CapitalizationMap getMapOutputInstance(FrozenMap arg) { return new CapitalizationMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static CapitalizationMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Capitalization1.class, arg, configuration); } } 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 abe37265987..f9bdea04199 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 @@ -40,7 +40,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 b03cea16eba..1876d2d33c1 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 @@ -54,7 +54,7 @@ public class Category1 extends JsonSchema { protected static CategoryMap getMapOutputInstance(FrozenMap arg) { return new CategoryMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static CategoryMap 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 5b14915cd0a..310ba0f72cc 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 @@ -40,7 +40,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 1e9a244167a..c40282367d0 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 @@ -41,7 +41,7 @@ public class Client1 extends JsonSchema { protected static ClientMap getMapOutputInstance(FrozenMap arg) { return new ClientMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ClientMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Client1.class, arg, configuration); } } 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 1187b4b23b2..830989aa5dc 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 @@ -45,7 +45,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } 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 399cfd7c6a4..7f0a8973a9f 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 @@ -49,7 +49,7 @@ public class DanishPig1 extends JsonSchema { protected static DanishPigMap getMapOutputInstance(FrozenMap arg) { return new DanishPigMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static DanishPigMap 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/Dog.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Dog.java index 0717cdee69f..ee70236541d 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 @@ -40,7 +40,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 b92f875b6f9..213ade4ced9 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 @@ -62,7 +62,7 @@ public class Drawing1 extends JsonSchema { protected static DrawingMap getMapOutputInstance(FrozenMap arg) { return new DrawingMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static DrawingMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Drawing1.class, arg, configuration); } } 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 c86c5ac36eb..847ece486b4 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 @@ -77,7 +77,7 @@ public class EnumArrays1 extends JsonSchema { protected static EnumArraysMap getMapOutputInstance(FrozenMap arg) { return new EnumArraysMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static EnumArraysMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(EnumArrays1.class, arg, configuration); } } 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 d8fdb82f1cd..9ed7338863d 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 @@ -104,7 +104,7 @@ public class EnumTest1 extends JsonSchema { protected static EnumTestMap getMapOutputInstance(FrozenMap arg) { return new EnumTestMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static EnumTestMap 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 44c7bbadec9..2a10dcbd9f2 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 @@ -45,7 +45,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 125a6a31f88..c0a9c66f2d3 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 @@ -43,7 +43,7 @@ public class File1 extends JsonSchema { protected static FileMap getMapOutputInstance(FrozenMap arg) { return new FileMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static FileMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(File1.class, arg, configuration); } } 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 ecebeccb9ea..49c3abeccf2 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 @@ -59,7 +59,7 @@ public class FileSchemaTestClass1 extends JsonSchema { protected static FileSchemaTestClassMap getMapOutputInstance(FrozenMap arg) { return new FileSchemaTestClassMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static FileSchemaTestClassMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(FileSchemaTestClass1.class, arg, configuration); } } 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 1e960a988b5..73948a59d0f 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 @@ -37,7 +37,7 @@ public class Foo1 extends JsonSchema { protected static FooMap getMapOutputInstance(FrozenMap arg) { return new FooMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static FooMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Foo1.class, arg, configuration); } } 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 99c98a191f1..874ba4b4646 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 @@ -268,7 +268,7 @@ public class FormatTest1 extends JsonSchema { protected static FormatTestMap getMapOutputInstance(FrozenMap arg) { return new FormatTestMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static FormatTestMap 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 c05cc873528..7db3a3c7f68 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 @@ -46,7 +46,7 @@ public class FromSchema1 extends JsonSchema { protected static FromSchemaMap getMapOutputInstance(FrozenMap arg) { return new FromSchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static FromSchemaMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(FromSchema1.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 acff8b4f380..bfa621296a1 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 @@ -44,7 +44,7 @@ public class GrandparentAnimal1 extends JsonSchema { protected static GrandparentAnimalMap getMapOutputInstance(FrozenMap arg) { return new GrandparentAnimalMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static GrandparentAnimalMap 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 a5f1d5018c4..0297502c346 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 @@ -45,7 +45,7 @@ public class HasOnlyReadOnly1 extends JsonSchema { protected static HasOnlyReadOnlyMap getMapOutputInstance(FrozenMap arg) { return new HasOnlyReadOnlyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HasOnlyReadOnlyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(HasOnlyReadOnly1.class, arg, configuration); } } 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 9ccd9c857cf..0b04cc8d089 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 @@ -52,7 +52,7 @@ public class HealthCheckResult1 extends JsonSchema { protected static HealthCheckResultMap getMapOutputInstance(FrozenMap arg) { return new HealthCheckResultMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HealthCheckResultMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(HealthCheckResult1.class, arg, configuration); } } 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 b12d7035a77..62d80efb926 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 @@ -45,7 +45,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 a8a3ba4026d..7bcbeaff226 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 @@ -67,7 +67,7 @@ public class JSONPatchRequestAddReplaceTest1 extends JsonSchema { protected static JSONPatchRequestAddReplaceTestMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestAddReplaceTestMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static JSONPatchRequestAddReplaceTestMap 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 43b479bb565..bffdbdaaa23 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 @@ -67,7 +67,7 @@ public class JSONPatchRequestMoveCopy1 extends JsonSchema { protected static JSONPatchRequestMoveCopyMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestMoveCopyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static JSONPatchRequestMoveCopyMap 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 fc4db99a58a..77b16c11fe9 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 @@ -62,7 +62,7 @@ public class JSONPatchRequestRemove1 extends JsonSchema { protected static JSONPatchRequestRemoveMap getMapOutputInstance(FrozenMap arg) { return new JSONPatchRequestRemoveMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static JSONPatchRequestRemoveMap 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/MapTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/MapTest.java index 52d700dbd6c..cd881744269 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 @@ -34,7 +34,7 @@ public class AdditionalProperties extends JsonSchema { protected static AdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new AdditionalPropertiesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static AdditionalPropertiesMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties.class, arg, configuration); } } @@ -57,7 +57,7 @@ public class MapMapOfString extends JsonSchema { protected static MapMapOfStringMap getMapOutputInstance(FrozenMap arg) { return new MapMapOfStringMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapMapOfStringMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapMapOfString.class, arg, configuration); } } @@ -89,7 +89,7 @@ public class MapOfEnumString extends JsonSchema { protected static MapOfEnumStringMap getMapOutputInstance(FrozenMap arg) { return new MapOfEnumStringMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapOfEnumStringMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapOfEnumString.class, arg, configuration); } } @@ -115,7 +115,7 @@ public class DirectMap extends JsonSchema { protected static DirectMapMap getMapOutputInstance(FrozenMap arg) { return new DirectMapMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static DirectMapMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(DirectMap.class, arg, configuration); } } @@ -149,7 +149,7 @@ public class MapTest1 extends JsonSchema { protected static MapTestMap getMapOutputInstance(FrozenMap arg) { return new MapTestMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapTestMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapTest1.class, arg, configuration); } } 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 4d3500b720a..f2181192dc6 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 @@ -37,7 +37,7 @@ public class MapSchema extends JsonSchema { protected static MapMap getMapOutputInstance(FrozenMap arg) { return new MapMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MapMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MapSchema.class, arg, configuration); } } @@ -70,7 +70,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass1 extends JsonSchema { protected static MixedPropertiesAndAdditionalPropertiesClassMap getMapOutputInstance(FrozenMap arg) { return new MixedPropertiesAndAdditionalPropertiesClassMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MixedPropertiesAndAdditionalPropertiesClassMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MixedPropertiesAndAdditionalPropertiesClass1.class, arg, configuration); } } 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 f768b927d1f..d3275f673fd 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 @@ -53,7 +53,7 @@ public class Money1 extends JsonSchema { protected static MoneyMap getMapOutputInstance(FrozenMap arg) { return new MoneyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MoneyMap 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 e44dc21ae93..e3380da6c9f 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 @@ -48,7 +48,7 @@ public class MyObjectDto1 extends JsonSchema { protected static MyObjectDtoMap getMapOutputInstance(FrozenMap arg) { return new MyObjectDtoMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static MyObjectDtoMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(MyObjectDto1.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 ec6e4dabd69..111569773fa 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 @@ -55,7 +55,7 @@ public class NoAdditionalProperties1 extends JsonSchema { protected static NoAdditionalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new NoAdditionalPropertiesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static NoAdditionalPropertiesMap 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 dcbb1a8235b..9a56cb38c96 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 @@ -249,7 +249,7 @@ public class ObjectNullableProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectNullableProp.class, arg, configuration); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectNullablePropMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectNullableProp.class, arg, configuration); } } @@ -285,7 +285,7 @@ public class ObjectAndItemsNullableProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectAndItemsNullableProp.class, arg, configuration); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectAndItemsNullablePropMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectAndItemsNullableProp.class, arg, configuration); } } @@ -320,7 +320,7 @@ public class ObjectItemsNullable extends JsonSchema { protected static ObjectItemsNullableMap getMapOutputInstance(FrozenMap arg) { return new ObjectItemsNullableMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectItemsNullableMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectItemsNullable.class, arg, configuration); } } @@ -363,7 +363,7 @@ public class NullableClass1 extends JsonSchema { protected static NullableClassMap getMapOutputInstance(FrozenMap arg) { return new NullableClassMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static NullableClassMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(NullableClass1.class, arg, configuration); } } 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 1797e9a5934..864e6b76cec 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 @@ -41,7 +41,7 @@ public class NumberOnly1 extends JsonSchema { protected static NumberOnlyMap getMapOutputInstance(FrozenMap arg) { return new NumberOnlyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static NumberOnlyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(NumberOnly1.class, arg, configuration); } } 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 50956855aec..866cb69b5a6 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 @@ -44,7 +44,7 @@ public class ObjWithRequiredProps1 extends JsonSchema { protected static ObjWithRequiredPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjWithRequiredPropsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjWithRequiredPropsMap 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 068bea8f480..8a37e8f19bc 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 @@ -44,7 +44,7 @@ public class ObjWithRequiredPropsBase1 extends JsonSchema { protected static ObjWithRequiredPropsBaseMap getMapOutputInstance(FrozenMap arg) { return new ObjWithRequiredPropsBaseMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjWithRequiredPropsBaseMap 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/ObjectModelWithArgAndArgsProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ObjectModelWithArgAndArgsProperties.java index 40573b375de..eabc1aef43c 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 @@ -49,7 +49,7 @@ public class ObjectModelWithArgAndArgsProperties1 extends JsonSchema { protected static ObjectModelWithArgAndArgsPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectModelWithArgAndArgsPropertiesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectModelWithArgAndArgsPropertiesMap 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 206f7ab1c33..3d3ed4d6922 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 @@ -41,7 +41,7 @@ a model that includes properties which should stay primitive (String + Boolean) protected static ObjectModelWithRefPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectModelWithRefPropsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectModelWithRefPropsMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectModelWithRefProps1.class, arg, configuration); } } 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 ac0f577708f..533d2520af1 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 @@ -43,7 +43,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 8477cb7cba9..b3b4973d788 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 @@ -47,7 +47,7 @@ public class ObjectWithCollidingProperties1 extends JsonSchema { protected static ObjectWithCollidingPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithCollidingPropertiesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithCollidingPropertiesMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithCollidingProperties1.class, arg, configuration); } } 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 0458889d509..a243ae17848 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 @@ -43,7 +43,7 @@ public class ObjectWithDecimalProperties1 extends JsonSchema { protected static ObjectWithDecimalPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithDecimalPropertiesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithDecimalPropertiesMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithDecimalProperties1.class, arg, configuration); } } 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 cca6c281a75..f3b057bd14f 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 @@ -56,7 +56,7 @@ public class ObjectWithDifficultlyNamedProps1 extends JsonSchema { protected static ObjectWithDifficultlyNamedPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithDifficultlyNamedPropsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithDifficultlyNamedPropsMap 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 c11058b5970..8643d7d053d 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 @@ -101,7 +101,7 @@ public class ObjectWithInlineCompositionProperty1 extends JsonSchema { protected static ObjectWithInlineCompositionPropertyMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithInlineCompositionPropertyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithInlineCompositionPropertyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithInlineCompositionProperty1.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 f84e65a9d45..7813706d367 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 @@ -42,7 +42,7 @@ public class ObjectWithInvalidNamedRefedProperties1 extends JsonSchema { protected static ObjectWithInvalidNamedRefedPropertiesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithInvalidNamedRefedPropertiesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithInvalidNamedRefedPropertiesMap 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 f45b6bd9092..ef89e546da6 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 @@ -46,7 +46,7 @@ public class ObjectWithNonIntersectingValues1 extends JsonSchema { protected static ObjectWithNonIntersectingValuesMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithNonIntersectingValuesMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithNonIntersectingValuesMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithNonIntersectingValues1.class, arg, configuration); } } 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 f28394d4cc4..0d1b701a39d 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 @@ -53,7 +53,7 @@ public class ObjectWithOnlyOptionalProps1 extends JsonSchema { protected static ObjectWithOnlyOptionalPropsMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOnlyOptionalPropsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithOnlyOptionalPropsMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithOnlyOptionalProps1.class, arg, configuration); } } 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 30f16c2afb9..b9b7faca701 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 @@ -41,7 +41,7 @@ public class ObjectWithOptionalTestProp1 extends JsonSchema { protected static ObjectWithOptionalTestPropMap getMapOutputInstance(FrozenMap arg) { return new ObjectWithOptionalTestPropMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ObjectWithOptionalTestPropMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ObjectWithOptionalTestProp1.class, arg, configuration); } } 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 f4542ad6b9b..98fe5eaffe1 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 @@ -70,7 +70,7 @@ public class Order1 extends JsonSchema { protected static OrderMap getMapOutputInstance(FrozenMap arg) { return new OrderMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static OrderMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Order1.class, arg, configuration); } } 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 7fcef5c21fb..daf0a149592 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 @@ -74,7 +74,7 @@ public class PaginatedResultMyObjectDto1 extends JsonSchema { protected static PaginatedResultMyObjectDtoMap getMapOutputInstance(FrozenMap arg) { return new PaginatedResultMyObjectDtoMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PaginatedResultMyObjectDtoMap 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/Pet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Pet.java index d2a07fe4630..62484a4ea35 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 @@ -108,7 +108,7 @@ public class Pet1 extends JsonSchema { protected static PetMap getMapOutputInstance(FrozenMap arg) { return new PetMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PetMap 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/Player.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Player.java index 7a553496472..8ff1a4fbbb9 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 @@ -44,7 +44,7 @@ public class Player1 extends JsonSchema { protected static PlayerMap getMapOutputInstance(FrozenMap arg) { return new PlayerMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PlayerMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Player1.class, arg, configuration); } } 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 03702e2a87b..5e18209db87 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 @@ -43,7 +43,7 @@ public class PublicKey1 extends JsonSchema { protected static PublicKeyMap getMapOutputInstance(FrozenMap arg) { return new PublicKeyMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PublicKeyMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PublicKey1.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 0c947b07d5e..e87ece2746a 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 @@ -45,7 +45,7 @@ public class ReadOnlyFirst1 extends JsonSchema { protected static ReadOnlyFirstMap getMapOutputInstance(FrozenMap arg) { return new ReadOnlyFirstMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ReadOnlyFirstMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(ReadOnlyFirst1.class, arg, configuration); } } 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 31d9bb038f7..37f77333ebd 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 @@ -41,7 +41,7 @@ public class ReqPropsFromExplicitAddProps1 extends JsonSchema { protected static ReqPropsFromExplicitAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromExplicitAddPropsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ReqPropsFromExplicitAddPropsMap 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 c078bfcaf1c..56b01f7eff2 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 @@ -41,7 +41,7 @@ public class ReqPropsFromTrueAddProps1 extends JsonSchema { protected static ReqPropsFromTrueAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromTrueAddPropsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ReqPropsFromTrueAddPropsMap 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 07f964898ac..8896076aa75 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 @@ -36,7 +36,7 @@ public class ReqPropsFromUnsetAddProps1 extends JsonSchema { protected static ReqPropsFromUnsetAddPropsMap getMapOutputInstance(FrozenMap arg) { return new ReqPropsFromUnsetAddPropsMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ReqPropsFromUnsetAddPropsMap 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/ScaleneTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/ScaleneTriangle.java index dcc629c9be1..af26930af1f 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 @@ -45,7 +45,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } } 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 60bdb8fef88..5ff49df83e0 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 @@ -38,7 +38,7 @@ public class SelfReferencingObjectModel1 extends JsonSchema { protected static SelfReferencingObjectModelMap getMapOutputInstance(FrozenMap arg) { return new SelfReferencingObjectModelMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SelfReferencingObjectModelMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SelfReferencingObjectModel1.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 736da38a7f0..b6cdeed9ab2 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 @@ -45,7 +45,7 @@ public class Schema1 extends JsonSchema { protected static Schema1Map getMapOutputInstance(FrozenMap arg) { return new Schema1Map(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static Schema1Map validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 f02dab2354d..872b24a835b 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 @@ -43,7 +43,7 @@ model with an invalid class name for python protected static SpecialModelnameMap getMapOutputInstance(FrozenMap arg) { return new SpecialModelnameMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SpecialModelnameMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(SpecialModelname1.class, arg, configuration); } } 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 bf359b7d737..22e15daff06 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 @@ -37,7 +37,7 @@ public class StringBooleanMap1 extends JsonSchema { protected static StringBooleanMapMap getMapOutputInstance(FrozenMap arg) { return new StringBooleanMapMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static StringBooleanMapMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(StringBooleanMap1.class, arg, configuration); } } 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 77738e9113e..5f7b3c3e9e3 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 @@ -46,7 +46,7 @@ public class Tag1 extends JsonSchema { protected static TagMap getMapOutputInstance(FrozenMap arg) { return new TagMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static TagMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Tag1.class, arg, configuration); } } 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 2283a4a8f09..3b54efbf150 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 @@ -159,7 +159,7 @@ public class User1 extends JsonSchema { protected static UserMap getMapOutputInstance(FrozenMap arg) { return new UserMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static UserMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(User1.class, arg, configuration); } } 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 784d8b9ec52..f62a50b5db8 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 @@ -58,7 +58,7 @@ public class Whale1 extends JsonSchema { protected static WhaleMap getMapOutputInstance(FrozenMap arg) { return new WhaleMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static WhaleMap 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 1d11bad5dd2..7c484f210fc 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 @@ -64,7 +64,7 @@ public class Zebra1 extends JsonSchema { protected static ZebraMap getMapOutputInstance(FrozenMap arg) { return new ZebraMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static ZebraMap 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/commonparamsubdir/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java index 23dd4b2f042..4ccce582dd2 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 @@ -39,7 +39,7 @@ public class HeaderParameters1 extends JsonSchema { protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeaderParametersMap 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/commonparamsubdir/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java index ecb84ac041e..592b43bac19 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/get/PathParameters.java index 748af044a12..271f3e536aa 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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 ce60896ef4a..286d8fbbcae 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 @@ -39,7 +39,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/commonparamsubdir/post/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/HeaderParameters.java index fff1bb5d618..b42e91a6cf5 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 @@ -39,7 +39,7 @@ public class HeaderParameters1 extends JsonSchema { protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeaderParametersMap 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/commonparamsubdir/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/commonparamsubdir/post/PathParameters.java index a7a0a217c43..2912e24a047 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/fake/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/delete/HeaderParameters.java index d926e151f5c..429820e6b92 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 @@ -44,7 +44,7 @@ public class HeaderParameters1 extends JsonSchema { protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeaderParametersMap 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 6686d5e79fe..1cfe32c188c 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 @@ -49,7 +49,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/get/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/HeaderParameters.java index 637ae021d8e..62219afc9d1 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 @@ -41,7 +41,7 @@ public class HeaderParameters1 extends JsonSchema { protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeaderParametersMap 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/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/get/QueryParameters.java index 42be28bfc34..83c245a4072 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 @@ -45,7 +45,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/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 e63c3b0221b..88245c1a411 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 @@ -71,7 +71,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/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 f39cb86a166..af55d6a5e4a 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 @@ -208,7 +208,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/fakebodywithqueryparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakebodywithqueryparams/put/QueryParameters.java index e0c2dfcb80c..5bb2eff4351 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 @@ -42,7 +42,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakecasesensitiveparams/put/QueryParameters.java index 9e51a716762..45e9b37b72c 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 @@ -48,7 +48,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/fakedeletecoffeeid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakedeletecoffeeid/delete/PathParameters.java index 2d53d0001b1..f4e918d6fd1 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/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 ba442224e02..4d520d4c209 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 @@ -31,7 +31,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/QueryParameters.java index a2d25da634d..1997310202c 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 @@ -41,7 +41,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/fakeinlinecomposition/post/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java index 0dd66c9e80b..064c9899187 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 @@ -95,7 +95,7 @@ public class Schema11 extends JsonSchema { protected static SchemaMap1 getMapOutputInstance(FrozenMap arg) { return new SchemaMap1(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap1 validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema11.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 e7ff01b75dc..9e47d780052 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 @@ -95,7 +95,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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 49e047f97fd..e7098ca00c9 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 @@ -95,7 +95,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/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 c97cd4b6321..8fed7b5d3fb 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 @@ -43,7 +43,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/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 32b1b85e05d..00cafec01e4 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 @@ -35,7 +35,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/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 0fca8bdaca2..66a25c76ba5 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 @@ -35,7 +35,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/fakeobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/QueryParameters.java index 80b5223f5cb..af0996f3638 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 @@ -39,7 +39,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/fakeobjinquery/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java index 9fa6bf32ca9..146ede8f79d 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 @@ -35,7 +35,7 @@ public class Schema01 extends JsonSchema { protected static SchemaMap0 getMapOutputInstance(FrozenMap arg) { return new SchemaMap0(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap0 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/fakeparametercollisions1ababselfab/post/CookieParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java index 24707f1203e..741f93f6a1e 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 @@ -47,7 +47,7 @@ public class CookieParameters1 extends JsonSchema { protected static CookieParametersMap getMapOutputInstance(FrozenMap arg) { return new CookieParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static CookieParametersMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(CookieParameters1.class, arg, configuration); } } 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 a5bd05335f7..d6e48658278 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 @@ -45,7 +45,7 @@ public class HeaderParameters1 extends JsonSchema { protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeaderParametersMap 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/fakeparametercollisions1ababselfab/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakeparametercollisions1ababselfab/post/PathParameters.java index a91cbd3c221..17680b1a1fe 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 @@ -54,7 +54,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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 8f5bfe2ae08..4c492dfbf84 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 @@ -47,7 +47,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/fakepetiduploadimagewithrequiredfile/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java index efab083a2ca..c7d7fc26f60 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java index 858ee9e7d17..8ea5097b84e 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 @@ -44,7 +44,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/fakequeryparamwithjsoncontenttype/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java index 45b18f84b29..4a40126ab7a 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 @@ -42,7 +42,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/fakerefobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fakerefobjinquery/get/QueryParameters.java index 8326721e6e4..0d6246818aa 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 @@ -39,7 +39,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/faketestqueryparamters/put/QueryParameters.java index 6e3310a8a76..4d96a148396 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 @@ -57,7 +57,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/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 28d34995b13..a5dd54f177a 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 @@ -44,7 +44,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/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 4d5c73f0153..890247fedf5 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 @@ -57,7 +57,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/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 72cfe88cba8..fca96d63d4a 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 @@ -32,7 +32,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/petfindbystatus/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbystatus/get/QueryParameters.java index 7bae2e703ed..4946a3737bc 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 @@ -42,7 +42,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petfindbytags/get/QueryParameters.java index a717efc17c4..4deb5b26b6e 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 @@ -42,7 +42,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/petpetid/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/HeaderParameters.java index 80a57a6a6b4..6ab13e5ee31 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 @@ -39,7 +39,7 @@ public class HeaderParameters1 extends JsonSchema { protected static HeaderParametersMap getMapOutputInstance(FrozenMap arg) { return new HeaderParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeaderParametersMap 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/petpetid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/delete/PathParameters.java index f64afa9f487..a0ecd9a60ab 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/get/PathParameters.java index 5d673c454a0..a9c1599b976 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/PathParameters.java index f8c7cc1ea7e..619a212be61 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java index dd1464a7833..1c776a04f40 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 @@ -39,7 +39,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/petpetiduploadimage/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/PathParameters.java index b20d60c9634..3dae1a22057 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java index 5239cbb733d..075452db6d9 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 @@ -41,7 +41,7 @@ public class Schema1 extends JsonSchema { protected static SchemaMap getMapOutputInstance(FrozenMap arg) { return new SchemaMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static SchemaMap 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/storeorderorderid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/delete/PathParameters.java index 09335752735..8ffb00de97b 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/storeorderorderid/get/PathParameters.java index 44ae2806014..6bc48c34ade 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/userlogin/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/QueryParameters.java index 1b2987db8c1..8f762b434e2 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 @@ -45,7 +45,7 @@ public class QueryParameters1 extends JsonSchema { protected static QueryParametersMap getMapOutputInstance(FrozenMap arg) { return new QueryParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static QueryParametersMap 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/responses/response200/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userlogin/get/responses/response200/Headers.java index d0625b34a56..bcab32a7fab 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 @@ -52,7 +52,7 @@ public class Headers1 extends JsonSchema { protected static HeadersMap getMapOutputInstance(FrozenMap arg) { return new HeadersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static HeadersMap 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/userusername/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/delete/PathParameters.java index f2c9661e2d0..64211c8a991 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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 8a3db427370..c06c706e15e 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap 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/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/userusername/put/PathParameters.java index 4d67fb0913a..d13a69e54f1 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 @@ -42,7 +42,7 @@ public class PathParameters1 extends JsonSchema { protected static PathParametersMap getMapOutputInstance(FrozenMap arg) { return new PathParametersMap(arg); } - public static T validate(Map arg, SchemaConfiguration configuration) { + public static PathParametersMap validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate(PathParameters1.class, arg, configuration); } } 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 fb6c3d92b9f..b5afa4d36bc 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 @@ -6,9 +6,15 @@ public static Void validate(Void arg, SchemaConfiguration configuration) { } {{/eq}} {{#eq this "object"}} + {{#if ../mapOutputJsonPathPiece}} +public static {{../mapOutputJsonPathPiece.camelCase}} validate(Map arg, SchemaConfiguration configuration) { + return JsonSchema.validate({{#if includeContainer}}{{containerJsonPathPiece.camelCase}}.{{/if}}{{jsonPathPiece.camelCase}}.class, arg, configuration); +} + {{else}} public static T validate(Map arg, SchemaConfiguration configuration) { return JsonSchema.validate({{#if includeContainer}}{{containerJsonPathPiece.camelCase}}.{{/if}}{{jsonPathPiece.camelCase}}.class, arg, configuration); } + {{/if}} {{/eq}} {{#eq this "array"}} public static U validate(List arg, SchemaConfiguration configuration) { From 8fbab66df6dc32a521c8fb53147d60051c55ffe7 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 20 Nov 2023 13:46:44 -0800 Subject: [PATCH 15/15] Integrates array and map output types into the validate methods --- .../content/applicationjson/Schema.java | 10 ++-- .../content/applicationjson/Schema.java | 10 ++-- .../content/applicationxml/Schema.java | 10 ++-- .../AdditionalPropertiesWithArrayOfEnums.java | 10 ++-- .../components/schemas/AnimalFarm.java | 10 ++-- .../schemas/ArrayHoldingAnyType.java | 10 ++-- .../schemas/ArrayOfArrayOfNumberOnly.java | 20 ++++---- .../components/schemas/ArrayOfEnums.java | 10 ++-- .../components/schemas/ArrayOfNumberOnly.java | 10 ++-- .../components/schemas/ArrayTest.java | 50 +++++++++---------- .../schemas/ArrayWithValidationsInItems.java | 10 ++-- ...posedAnyOfDifferentTypesNoValidations.java | 10 ++-- .../components/schemas/ComposedArray.java | 10 ++-- .../schemas/ComposedOneOfDifferentTypes.java | 10 ++-- .../components/schemas/Drawing.java | 10 ++-- .../components/schemas/EnumArrays.java | 10 ++-- .../schemas/FileSchemaTestClass.java | 10 ++-- .../components/schemas/FormatTest.java | 10 ++-- .../components/schemas/Items.java | 10 ++-- .../components/schemas/JSONPatchRequest.java | 10 ++-- .../components/schemas/NullableClass.java | 22 ++++---- .../schemas/PaginatedResultMyObjectDto.java | 10 ++-- .../components/schemas/Pet.java | 20 ++++---- .../schemas/SelfReferencingArrayModel.java | 10 ++-- .../get/parameters/parameter0/Schema0.java | 10 ++-- .../get/parameters/parameter2/Schema2.java | 10 ++-- .../applicationxwwwformurlencoded/Schema.java | 10 ++-- .../put/parameters/parameter0/Schema0.java | 10 ++-- .../put/parameters/parameter1/Schema1.java | 10 ++-- .../put/parameters/parameter2/Schema2.java | 10 ++-- .../put/parameters/parameter3/Schema3.java | 10 ++-- .../put/parameters/parameter4/Schema4.java | 10 ++-- .../content/multipartformdata/Schema.java | 10 ++-- .../get/parameters/parameter0/Schema0.java | 10 ++-- .../get/parameters/parameter0/Schema0.java | 10 ++-- .../codegen/generators/DefaultGenerator.java | 3 +- .../generators/JavaClientGenerator.java | 1 + .../schemas/SchemaClass/_validate.hbs | 6 +++ 38 files changed, 220 insertions(+), 212 deletions(-) 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 7826663dbb5..0817c57d0cd 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 @@ -11,8 +11,8 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - public static class SchemaTuple extends FrozenList { - SchemaTuple(FrozenList m) { + public static class SchemaList extends FrozenList { + SchemaList(FrozenList m) { super(m); } } @@ -22,10 +22,10 @@ public class Schema1 extends JsonSchema { FrozenList.class )); public static final Class items = User.User1.class; - protected static SchemaTuple getListOutputInstance(FrozenList arg) { - return new SchemaTuple(arg); + protected static SchemaList getListOutputInstance(FrozenList arg) { + return new SchemaList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } }} 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 0da641ce274..c2d767aa38e 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 @@ -12,8 +12,8 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - public static class SchemaTuple extends FrozenList { - SchemaTuple(FrozenList m) { + public static class SchemaList extends FrozenList { + SchemaList(FrozenList m) { super(m); } } @@ -23,10 +23,10 @@ public class Schema1 extends JsonSchema { FrozenList.class )); public static final Class items = RefPet.RefPet1.class; - protected static SchemaTuple getListOutputInstance(FrozenList arg) { - return new SchemaTuple(arg); + protected static SchemaList getListOutputInstance(FrozenList arg) { + return new SchemaList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.class, arg, configuration); } }} 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 b19492b5d5a..dd611a01629 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 @@ -11,8 +11,8 @@ public class Schema { // nest classes so all schemas and input/output classes can be public - public static class SchemaTuple extends FrozenList { - SchemaTuple(FrozenList m) { + public static class SchemaList extends FrozenList { + SchemaList(FrozenList m) { super(m); } } @@ -22,10 +22,10 @@ public class Schema1 extends JsonSchema { FrozenList.class )); public static final Class items = Pet.Pet1.class; - protected static SchemaTuple getListOutputInstance(FrozenList arg) { - return new SchemaTuple(arg); + protected static SchemaList getListOutputInstance(FrozenList arg) { + return new SchemaList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema1.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 9289f65344b..504c500c0bb 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 @@ -12,8 +12,8 @@ public class AdditionalPropertiesWithArrayOfEnums { // nest classes so all schemas and input/output classes can be public - public static class AdditionalPropertiesTuple extends FrozenList { - AdditionalPropertiesTuple(FrozenList m) { + public static class AdditionalPropertiesList extends FrozenList { + AdditionalPropertiesList(FrozenList m) { super(m); } } @@ -23,10 +23,10 @@ public class AdditionalProperties extends JsonSchema { FrozenList.class )); public static final Class items = EnumClass.EnumClass1.class; - protected static AdditionalPropertiesTuple getListOutputInstance(FrozenList arg) { - return new AdditionalPropertiesTuple(arg); + protected static AdditionalPropertiesList getListOutputInstance(FrozenList arg) { + return new AdditionalPropertiesList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static AdditionalPropertiesList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(AdditionalProperties.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 77e2ad18c51..f05bde7cdda 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 @@ -10,8 +10,8 @@ public class AnimalFarm { // nest classes so all schemas and input/output classes can be public - public static class AnimalFarmTuple extends FrozenList { - AnimalFarmTuple(FrozenList m) { + public static class AnimalFarmList extends FrozenList { + AnimalFarmList(FrozenList m) { super(m); } } @@ -27,10 +27,10 @@ public class AnimalFarm1 extends JsonSchema { FrozenList.class )); public static final Class items = Animal.Animal1.class; - protected static AnimalFarmTuple getListOutputInstance(FrozenList arg) { - return new AnimalFarmTuple(arg); + protected static AnimalFarmList getListOutputInstance(FrozenList arg) { + return new AnimalFarmList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static AnimalFarmList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(AnimalFarm1.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 01d06d58132..41741aaf463 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 @@ -14,8 +14,8 @@ public class ArrayHoldingAnyType { public class Items extends AnyTypeJsonSchema {} - public static class ArrayHoldingAnyTypeTuple extends FrozenList { - ArrayHoldingAnyTypeTuple(FrozenList m) { + public static class ArrayHoldingAnyTypeList extends FrozenList { + ArrayHoldingAnyTypeList(FrozenList m) { super(m); } } @@ -31,10 +31,10 @@ public class ArrayHoldingAnyType1 extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ArrayHoldingAnyTypeTuple getListOutputInstance(FrozenList arg) { - return new ArrayHoldingAnyTypeTuple(arg); + protected static ArrayHoldingAnyTypeList getListOutputInstance(FrozenList arg) { + return new ArrayHoldingAnyTypeList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayHoldingAnyTypeList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayHoldingAnyType1.class, arg, configuration); } }} 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 9a25f3ecb77..8bc013e145d 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 @@ -18,8 +18,8 @@ public class ArrayOfArrayOfNumberOnly { public class Items1 extends NumberJsonSchema {} - public static class ItemsTuple extends FrozenList { - ItemsTuple(FrozenList m) { + public static class ItemsList extends FrozenList { + ItemsList(FrozenList m) { super(m); } } @@ -29,16 +29,16 @@ public class Items extends JsonSchema { FrozenList.class )); public static final Class items = Items1.class; - protected static ItemsTuple getListOutputInstance(FrozenList arg) { - return new ItemsTuple(arg); + protected static ItemsList getListOutputInstance(FrozenList arg) { + return new ItemsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ItemsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items.class, arg, configuration); } } - public static class ArrayArrayNumberTuple extends FrozenList { - ArrayArrayNumberTuple(FrozenList m) { + public static class ArrayArrayNumberList extends FrozenList { + ArrayArrayNumberList(FrozenList m) { super(m); } } @@ -48,10 +48,10 @@ public class ArrayArrayNumber extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ArrayArrayNumberTuple getListOutputInstance(FrozenList arg) { - return new ArrayArrayNumberTuple(arg); + protected static ArrayArrayNumberList getListOutputInstance(FrozenList arg) { + return new ArrayArrayNumberList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayArrayNumberList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayArrayNumber.class, arg, configuration); } } 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 7744ed691d9..ae27a1f24db 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 @@ -10,8 +10,8 @@ public class ArrayOfEnums { // nest classes so all schemas and input/output classes can be public - public static class ArrayOfEnumsTuple extends FrozenList { - ArrayOfEnumsTuple(FrozenList m) { + public static class ArrayOfEnumsList extends FrozenList { + ArrayOfEnumsList(FrozenList m) { super(m); } } @@ -27,10 +27,10 @@ public class ArrayOfEnums1 extends JsonSchema { FrozenList.class )); public static final Class items = StringEnum.StringEnum1.class; - protected static ArrayOfEnumsTuple getListOutputInstance(FrozenList arg) { - return new ArrayOfEnumsTuple(arg); + protected static ArrayOfEnumsList getListOutputInstance(FrozenList arg) { + return new ArrayOfEnumsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayOfEnumsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfEnums1.class, arg, configuration); } }} 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 85f5bee73fe..20dbea6ebad 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 @@ -18,8 +18,8 @@ public class ArrayOfNumberOnly { public class Items extends NumberJsonSchema {} - public static class ArrayNumberTuple extends FrozenList { - ArrayNumberTuple(FrozenList m) { + public static class ArrayNumberList extends FrozenList { + ArrayNumberList(FrozenList m) { super(m); } } @@ -29,10 +29,10 @@ public class ArrayNumber extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ArrayNumberTuple getListOutputInstance(FrozenList arg) { - return new ArrayNumberTuple(arg); + protected static ArrayNumberList getListOutputInstance(FrozenList arg) { + return new ArrayNumberList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayNumberList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayNumber.class, arg, configuration); } } 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 cff7824a4c4..3844ecb3ddf 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 @@ -19,8 +19,8 @@ public class ArrayTest { public class Items extends StringJsonSchema {} - public static class ArrayOfStringTuple extends FrozenList { - ArrayOfStringTuple(FrozenList m) { + public static class ArrayOfStringList extends FrozenList { + ArrayOfStringList(FrozenList m) { super(m); } } @@ -30,10 +30,10 @@ public class ArrayOfString extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ArrayOfStringTuple getListOutputInstance(FrozenList arg) { - return new ArrayOfStringTuple(arg); + protected static ArrayOfStringList getListOutputInstance(FrozenList arg) { + return new ArrayOfStringList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayOfStringList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayOfString.class, arg, configuration); } } @@ -41,8 +41,8 @@ public static U validate(List arg, SchemaConfigur public class Items2 extends Int64JsonSchema {} - public static class ItemsTuple extends FrozenList { - ItemsTuple(FrozenList m) { + public static class ItemsList extends FrozenList { + ItemsList(FrozenList m) { super(m); } } @@ -52,16 +52,16 @@ public class Items1 extends JsonSchema { FrozenList.class )); public static final Class items = Items2.class; - protected static ItemsTuple getListOutputInstance(FrozenList arg) { - return new ItemsTuple(arg); + protected static ItemsList getListOutputInstance(FrozenList arg) { + return new ItemsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ItemsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items1.class, arg, configuration); } } - public static class ArrayArrayOfIntegerTuple extends FrozenList { - ArrayArrayOfIntegerTuple(FrozenList m) { + public static class ArrayArrayOfIntegerList extends FrozenList { + ArrayArrayOfIntegerList(FrozenList m) { super(m); } } @@ -71,16 +71,16 @@ public class ArrayArrayOfInteger extends JsonSchema { FrozenList.class )); public static final Class items = Items1.class; - protected static ArrayArrayOfIntegerTuple getListOutputInstance(FrozenList arg) { - return new ArrayArrayOfIntegerTuple(arg); + protected static ArrayArrayOfIntegerList getListOutputInstance(FrozenList arg) { + return new ArrayArrayOfIntegerList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayArrayOfIntegerList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayArrayOfInteger.class, arg, configuration); } } - public static class ItemsTuple1 extends FrozenList { - ItemsTuple1(FrozenList m) { + public static class ItemsList1 extends FrozenList { + ItemsList1(FrozenList m) { super(m); } } @@ -90,16 +90,16 @@ public class Items3 extends JsonSchema { FrozenList.class )); public static final Class items = ReadOnlyFirst.ReadOnlyFirst1.class; - protected static ItemsTuple1 getListOutputInstance(FrozenList arg) { - return new ItemsTuple1(arg); + protected static ItemsList1 getListOutputInstance(FrozenList arg) { + return new ItemsList1(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ItemsList1 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items3.class, arg, configuration); } } - public static class ArrayArrayOfModelTuple extends FrozenList { - ArrayArrayOfModelTuple(FrozenList m) { + public static class ArrayArrayOfModelList extends FrozenList { + ArrayArrayOfModelList(FrozenList m) { super(m); } } @@ -109,10 +109,10 @@ public class ArrayArrayOfModel extends JsonSchema { FrozenList.class )); public static final Class items = Items3.class; - protected static ArrayArrayOfModelTuple getListOutputInstance(FrozenList arg) { - return new ArrayArrayOfModelTuple(arg); + protected static ArrayArrayOfModelList getListOutputInstance(FrozenList arg) { + return new ArrayArrayOfModelList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayArrayOfModelList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayArrayOfModel.class, arg, configuration); } } 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 ea27b79bc5e..6f5013a9986 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 @@ -35,8 +35,8 @@ public static Long validate(Double arg, SchemaConfiguration configuration) { } } - public static class ArrayWithValidationsInItemsTuple extends FrozenList { - ArrayWithValidationsInItemsTuple(FrozenList m) { + public static class ArrayWithValidationsInItemsList extends FrozenList { + ArrayWithValidationsInItemsList(FrozenList m) { super(m); } } @@ -52,10 +52,10 @@ public class ArrayWithValidationsInItems1 extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ArrayWithValidationsInItemsTuple getListOutputInstance(FrozenList arg) { - return new ArrayWithValidationsInItemsTuple(arg); + protected static ArrayWithValidationsInItemsList getListOutputInstance(FrozenList arg) { + return new ArrayWithValidationsInItemsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayWithValidationsInItemsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayWithValidationsInItems1.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 fbe0a5df439..6196160db8c 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 @@ -60,8 +60,8 @@ public class Schema8 extends NullJsonSchema {} public class Items extends AnyTypeJsonSchema {} - public static class Schema9Tuple extends FrozenList { - Schema9Tuple(FrozenList m) { + public static class Schema9List extends FrozenList { + Schema9List(FrozenList m) { super(m); } } @@ -71,10 +71,10 @@ public class Schema9 extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static Schema9Tuple getListOutputInstance(FrozenList arg) { - return new Schema9Tuple(arg); + protected static Schema9List getListOutputInstance(FrozenList arg) { + return new Schema9List(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static Schema9List validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema9.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 266447325ac..2789b564c22 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 @@ -14,8 +14,8 @@ public class ComposedArray { public class Items extends AnyTypeJsonSchema {} - public static class ComposedArrayTuple extends FrozenList { - ComposedArrayTuple(FrozenList m) { + public static class ComposedArrayList extends FrozenList { + ComposedArrayList(FrozenList m) { super(m); } } @@ -31,10 +31,10 @@ public class ComposedArray1 extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ComposedArrayTuple getListOutputInstance(FrozenList arg) { - return new ComposedArrayTuple(arg); + protected static ComposedArrayList getListOutputInstance(FrozenList arg) { + return new ComposedArrayList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ComposedArrayList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ComposedArray1.class, arg, configuration); } }} 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 d11133d2069..35d2fe9d564 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 @@ -37,8 +37,8 @@ public static T validate(Map arg, SchemaCo public class Items extends AnyTypeJsonSchema {} - public static class Schema5Tuple extends FrozenList { - Schema5Tuple(FrozenList m) { + public static class Schema5List extends FrozenList { + Schema5List(FrozenList m) { super(m); } } @@ -48,10 +48,10 @@ public class Schema5 extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static Schema5Tuple getListOutputInstance(FrozenList arg) { - return new Schema5Tuple(arg); + protected static Schema5List getListOutputInstance(FrozenList arg) { + return new Schema5List(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static Schema5List validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema5.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 213ade4ced9..b778cb63aa8 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 @@ -14,8 +14,8 @@ public class Drawing { // nest classes so all schemas and input/output classes can be public - public static class ShapesTuple extends FrozenList { - ShapesTuple(FrozenList m) { + public static class ShapesList extends FrozenList { + ShapesList(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Shapes extends JsonSchema { FrozenList.class )); public static final Class items = Shape.Shape1.class; - protected static ShapesTuple getListOutputInstance(FrozenList arg) { - return new ShapesTuple(arg); + protected static ShapesList getListOutputInstance(FrozenList arg) { + return new ShapesList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ShapesList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Shapes.class, arg, configuration); } } 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 847ece486b4..7023f1d2687 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 @@ -32,8 +32,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public static class ArrayEnumTuple extends FrozenList { - ArrayEnumTuple(FrozenList m) { + public static class ArrayEnumList extends FrozenList { + ArrayEnumList(FrozenList m) { super(m); } } @@ -43,10 +43,10 @@ public class ArrayEnum extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ArrayEnumTuple getListOutputInstance(FrozenList arg) { - return new ArrayEnumTuple(arg); + protected static ArrayEnumList getListOutputInstance(FrozenList arg) { + return new ArrayEnumList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayEnumList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayEnum.class, arg, configuration); } } 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 49c3abeccf2..9dbdd393d20 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 @@ -14,8 +14,8 @@ public class FileSchemaTestClass { // nest classes so all schemas and input/output classes can be public - public static class FilesTuple extends FrozenList { - FilesTuple(FrozenList m) { + public static class FilesList extends FrozenList { + FilesList(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Files extends JsonSchema { FrozenList.class )); public static final Class items = File.File1.class; - protected static FilesTuple getListOutputInstance(FrozenList arg) { - return new FilesTuple(arg); + protected static FilesList getListOutputInstance(FrozenList arg) { + return new FilesList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static FilesList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Files.class, arg, configuration); } } 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 874ba4b4646..d2538c141f5 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 @@ -138,8 +138,8 @@ public class Float64 extends DoubleJsonSchema {} public class Items extends NumberJsonSchema {} - public static class ArrayWithUniqueItemsTuple extends FrozenList { - ArrayWithUniqueItemsTuple(FrozenList m) { + public static class ArrayWithUniqueItemsList extends FrozenList { + ArrayWithUniqueItemsList(FrozenList m) { super(m); } } @@ -149,10 +149,10 @@ public class ArrayWithUniqueItems extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static ArrayWithUniqueItemsTuple getListOutputInstance(FrozenList arg) { - return new ArrayWithUniqueItemsTuple(arg); + protected static ArrayWithUniqueItemsList getListOutputInstance(FrozenList arg) { + return new ArrayWithUniqueItemsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayWithUniqueItemsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayWithUniqueItems.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 23b9d61030f..69721a53f2b 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 @@ -14,8 +14,8 @@ public class Items { public class Items2 extends MapJsonSchema {} - public static class ItemsTuple extends FrozenList { - ItemsTuple(FrozenList m) { + public static class ItemsList extends FrozenList { + ItemsList(FrozenList m) { super(m); } } @@ -33,10 +33,10 @@ public class Items1 extends JsonSchema { FrozenList.class )); public static final Class items = Items2.class; - protected static ItemsTuple getListOutputInstance(FrozenList arg) { - return new ItemsTuple(arg); + protected static ItemsList getListOutputInstance(FrozenList arg) { + return new ItemsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ItemsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Items1.class, arg, configuration); } }} 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 fe411dc4a3a..3c4e0d8d705 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 @@ -65,8 +65,8 @@ public static U validate(List arg, SchemaConfigur } } - public static class JSONPatchRequestTuple extends FrozenList { - JSONPatchRequestTuple(FrozenList m) { + public static class JSONPatchRequestList extends FrozenList { + JSONPatchRequestList(FrozenList m) { super(m); } } @@ -82,10 +82,10 @@ public class JSONPatchRequest1 extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static JSONPatchRequestTuple getListOutputInstance(FrozenList arg) { - return new JSONPatchRequestTuple(arg); + protected static JSONPatchRequestList getListOutputInstance(FrozenList arg) { + return new JSONPatchRequestList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static JSONPatchRequestList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(JSONPatchRequest1.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 9a56cb38c96..7554fe68531 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 @@ -143,8 +143,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { public class Items extends MapJsonSchema {} - public static class ArrayNullablePropTuple extends FrozenList { - ArrayNullablePropTuple(FrozenList m) { + public static class ArrayNullablePropList extends FrozenList { + ArrayNullablePropList(FrozenList m) { super(m); } } @@ -158,7 +158,7 @@ public class ArrayNullableProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayNullableProp.class, arg, configuration); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayNullablePropList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayNullableProp.class, arg, configuration); } } @@ -176,8 +176,8 @@ public static T validate(Map arg, SchemaCo } } - public static class ArrayAndItemsNullablePropTuple extends FrozenList { - ArrayAndItemsNullablePropTuple(FrozenList m) { + public static class ArrayAndItemsNullablePropList extends FrozenList { + ArrayAndItemsNullablePropList(FrozenList m) { super(m); } } @@ -191,7 +191,7 @@ public class ArrayAndItemsNullableProp extends JsonSchema { public static Void validate(Void arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayAndItemsNullableProp.class, arg, configuration); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayAndItemsNullablePropList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayAndItemsNullableProp.class, arg, configuration); } } @@ -209,8 +209,8 @@ public static T validate(Map arg, SchemaCo } } - public static class ArrayItemsNullableTuple extends FrozenList { - ArrayItemsNullableTuple(FrozenList m) { + public static class ArrayItemsNullableList extends FrozenList { + ArrayItemsNullableList(FrozenList m) { super(m); } } @@ -220,10 +220,10 @@ public class ArrayItemsNullable extends JsonSchema { FrozenList.class )); public static final Class items = Items2.class; - protected static ArrayItemsNullableTuple getListOutputInstance(FrozenList arg) { - return new ArrayItemsNullableTuple(arg); + protected static ArrayItemsNullableList getListOutputInstance(FrozenList arg) { + return new ArrayItemsNullableList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ArrayItemsNullableList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(ArrayItemsNullable.class, arg, configuration); } } 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 daf0a149592..e818adc0f8a 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 @@ -24,8 +24,8 @@ public class AdditionalProperties extends NotAnyTypeJsonSchema {} public class Count extends IntJsonSchema {} - public static class ResultsTuple extends FrozenList { - ResultsTuple(FrozenList m) { + public static class ResultsList extends FrozenList { + ResultsList(FrozenList m) { super(m); } } @@ -35,10 +35,10 @@ public class Results extends JsonSchema { FrozenList.class )); public static final Class items = MyObjectDto.MyObjectDto1.class; - protected static ResultsTuple getListOutputInstance(FrozenList arg) { - return new ResultsTuple(arg); + protected static ResultsList getListOutputInstance(FrozenList arg) { + return new ResultsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static ResultsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Results.class, arg, configuration); } } 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 62484a4ea35..5e3139277e6 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 @@ -25,8 +25,8 @@ public class Name extends StringJsonSchema {} public class Items extends StringJsonSchema {} - public static class PhotoUrlsTuple extends FrozenList { - PhotoUrlsTuple(FrozenList m) { + public static class PhotoUrlsList extends FrozenList { + PhotoUrlsList(FrozenList m) { super(m); } } @@ -36,10 +36,10 @@ public class PhotoUrls extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static PhotoUrlsTuple getListOutputInstance(FrozenList arg) { - return new PhotoUrlsTuple(arg); + protected static PhotoUrlsList getListOutputInstance(FrozenList arg) { + return new PhotoUrlsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static PhotoUrlsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(PhotoUrls.class, arg, configuration); } } @@ -53,8 +53,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public static class TagsTuple extends FrozenList { - TagsTuple(FrozenList m) { + public static class TagsList extends FrozenList { + TagsList(FrozenList m) { super(m); } } @@ -64,10 +64,10 @@ public class Tags extends JsonSchema { FrozenList.class )); public static final Class items = Tag.Tag1.class; - protected static TagsTuple getListOutputInstance(FrozenList arg) { - return new TagsTuple(arg); + protected static TagsList getListOutputInstance(FrozenList arg) { + return new TagsList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static TagsList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Tags.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 159598add82..ed4785fa4d1 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 @@ -10,8 +10,8 @@ public class SelfReferencingArrayModel { // nest classes so all schemas and input/output classes can be public - public static class SelfReferencingArrayModelTuple extends FrozenList { - SelfReferencingArrayModelTuple(FrozenList m) { + public static class SelfReferencingArrayModelList extends FrozenList { + SelfReferencingArrayModelList(FrozenList m) { super(m); } } @@ -27,10 +27,10 @@ public class SelfReferencingArrayModel1 extends JsonSchema { FrozenList.class )); public static final Class items = SelfReferencingArrayModel1.class; - protected static SelfReferencingArrayModelTuple getListOutputInstance(FrozenList arg) { - return new SelfReferencingArrayModelTuple(arg); + protected static SelfReferencingArrayModelList getListOutputInstance(FrozenList arg) { + return new SelfReferencingArrayModelList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SelfReferencingArrayModelList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(SelfReferencingArrayModel1.class, arg, configuration); } }} 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 916f7c536bc..5db013a56a8 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 @@ -19,8 +19,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public static class SchemaTuple0 extends FrozenList { - SchemaTuple0(FrozenList m) { + public static class SchemaList0 extends FrozenList { + SchemaList0(FrozenList m) { super(m); } } @@ -30,10 +30,10 @@ public class Schema01 extends JsonSchema { FrozenList.class )); public static final Class items = Items0.class; - protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { - return new SchemaTuple0(arg); + protected static SchemaList0 getListOutputInstance(FrozenList arg) { + return new SchemaList0(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList0 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, arg, configuration); } }} 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 e1fe7e8bf62..00cfa65dafb 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 @@ -19,8 +19,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public static class SchemaTuple2 extends FrozenList { - SchemaTuple2(FrozenList m) { + public static class SchemaList2 extends FrozenList { + SchemaList2(FrozenList m) { super(m); } } @@ -30,10 +30,10 @@ public class Schema21 extends JsonSchema { FrozenList.class )); public static final Class items = Items2.class; - protected static SchemaTuple2 getListOutputInstance(FrozenList arg) { - return new SchemaTuple2(arg); + protected static SchemaList2 getListOutputInstance(FrozenList arg) { + return new SchemaList2(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList2 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema21.class, arg, configuration); } }} 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 88245c1a411..737a9cd657a 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 @@ -23,8 +23,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public static class EnumFormStringArrayTuple extends FrozenList { - EnumFormStringArrayTuple(FrozenList m) { + public static class EnumFormStringArrayList extends FrozenList { + EnumFormStringArrayList(FrozenList m) { super(m); } } @@ -34,10 +34,10 @@ public class EnumFormStringArray extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static EnumFormStringArrayTuple getListOutputInstance(FrozenList arg) { - return new EnumFormStringArrayTuple(arg); + protected static EnumFormStringArrayList getListOutputInstance(FrozenList arg) { + return new EnumFormStringArrayList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static EnumFormStringArrayList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(EnumFormStringArray.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 c571b27aeb4..9a6d818c65b 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 @@ -14,8 +14,8 @@ public class Schema0 { public class Items0 extends StringJsonSchema {} - public static class SchemaTuple0 extends FrozenList { - SchemaTuple0(FrozenList m) { + public static class SchemaList0 extends FrozenList { + SchemaList0(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Schema01 extends JsonSchema { FrozenList.class )); public static final Class items = Items0.class; - protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { - return new SchemaTuple0(arg); + protected static SchemaList0 getListOutputInstance(FrozenList arg) { + return new SchemaList0(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList0 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, arg, configuration); } }} 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 4bf5d47524b..e0f12b760f3 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 @@ -14,8 +14,8 @@ public class Schema1 { public class Items1 extends StringJsonSchema {} - public static class SchemaTuple1 extends FrozenList { - SchemaTuple1(FrozenList m) { + public static class SchemaList1 extends FrozenList { + SchemaList1(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Schema11 extends JsonSchema { FrozenList.class )); public static final Class items = Items1.class; - protected static SchemaTuple1 getListOutputInstance(FrozenList arg) { - return new SchemaTuple1(arg); + protected static SchemaList1 getListOutputInstance(FrozenList arg) { + return new SchemaList1(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList1 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema11.class, arg, configuration); } }} 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 39c3af05152..d0cca651db3 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 @@ -14,8 +14,8 @@ public class Schema2 { public class Items2 extends StringJsonSchema {} - public static class SchemaTuple2 extends FrozenList { - SchemaTuple2(FrozenList m) { + public static class SchemaList2 extends FrozenList { + SchemaList2(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Schema21 extends JsonSchema { FrozenList.class )); public static final Class items = Items2.class; - protected static SchemaTuple2 getListOutputInstance(FrozenList arg) { - return new SchemaTuple2(arg); + protected static SchemaList2 getListOutputInstance(FrozenList arg) { + return new SchemaList2(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList2 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema21.class, arg, configuration); } }} 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 6baf6f0e0a5..5eef62bdafc 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 @@ -14,8 +14,8 @@ public class Schema3 { public class Items3 extends StringJsonSchema {} - public static class SchemaTuple3 extends FrozenList { - SchemaTuple3(FrozenList m) { + public static class SchemaList3 extends FrozenList { + SchemaList3(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Schema31 extends JsonSchema { FrozenList.class )); public static final Class items = Items3.class; - protected static SchemaTuple3 getListOutputInstance(FrozenList arg) { - return new SchemaTuple3(arg); + protected static SchemaList3 getListOutputInstance(FrozenList arg) { + return new SchemaList3(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList3 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema31.class, arg, configuration); } }} 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 5233b4c9705..a2237a0c1ed 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 @@ -14,8 +14,8 @@ public class Schema4 { public class Items4 extends StringJsonSchema {} - public static class SchemaTuple4 extends FrozenList { - SchemaTuple4(FrozenList m) { + public static class SchemaList4 extends FrozenList { + SchemaList4(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Schema41 extends JsonSchema { FrozenList.class )); public static final Class items = Items4.class; - protected static SchemaTuple4 getListOutputInstance(FrozenList arg) { - return new SchemaTuple4(arg); + protected static SchemaList4 getListOutputInstance(FrozenList arg) { + return new SchemaList4(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList4 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema41.class, arg, configuration); } }} 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 890247fedf5..bac0ac517a1 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 @@ -19,8 +19,8 @@ public class Items extends JsonSchema { } - public static class FilesTuple extends FrozenList { - FilesTuple(FrozenList m) { + public static class FilesList extends FrozenList { + FilesList(FrozenList m) { super(m); } } @@ -30,10 +30,10 @@ public class Files extends JsonSchema { FrozenList.class )); public static final Class items = Items.class; - protected static FilesTuple getListOutputInstance(FrozenList arg) { - return new FilesTuple(arg); + protected static FilesList getListOutputInstance(FrozenList arg) { + return new FilesList(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static FilesList validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Files.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 2994b2cd4ea..6bd908cb845 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 @@ -19,8 +19,8 @@ public static String validate(String arg, SchemaConfiguration configuration) { } } - public static class SchemaTuple0 extends FrozenList { - SchemaTuple0(FrozenList m) { + public static class SchemaList0 extends FrozenList { + SchemaList0(FrozenList m) { super(m); } } @@ -30,10 +30,10 @@ public class Schema01 extends JsonSchema { FrozenList.class )); public static final Class items = Items0.class; - protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { - return new SchemaTuple0(arg); + protected static SchemaList0 getListOutputInstance(FrozenList arg) { + return new SchemaList0(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList0 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.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 3b44204ba7e..58ae1f40369 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 @@ -14,8 +14,8 @@ public class Schema0 { public class Items0 extends StringJsonSchema {} - public static class SchemaTuple0 extends FrozenList { - SchemaTuple0(FrozenList m) { + public static class SchemaList0 extends FrozenList { + SchemaList0(FrozenList m) { super(m); } } @@ -25,10 +25,10 @@ public class Schema01 extends JsonSchema { FrozenList.class )); public static final Class items = Items0.class; - protected static SchemaTuple0 getListOutputInstance(FrozenList arg) { - return new SchemaTuple0(arg); + protected static SchemaList0 getListOutputInstance(FrozenList arg) { + return new SchemaList0(arg); } - public static U validate(List arg, SchemaConfiguration configuration) { + public static SchemaList0 validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate(Schema01.class, arg, configuration); } }} diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index e4a3239a428..9f880cf726c 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -349,6 +349,7 @@ public class DefaultGenerator implements Generator { protected boolean addSchemaImportsFromV3SpecLocations = false; protected boolean deepestRefSchemaImportNeeded = false; protected String objectIOClassNamePiece = "Dict"; + protected String arrayIOClassNamePiece = "Tuple"; @Override public List cliOptions() { @@ -2446,7 +2447,7 @@ public CodegenSchema fromSchema(Schema p, String sourceJsonPath, String currentJ } } if ((property.types == null || property.types.contains("array")) && sourceJsonPath != null && property.items != null) { - property.arrayOutputJsonPathPiece = getKey(currentName + "Tuple", "schemaProperty", sourceJsonPath); + property.arrayOutputJsonPathPiece = getKey(currentName + arrayIOClassNamePiece, "schemaProperty", sourceJsonPath); property.arrayInputJsonPathPiece = getKey(currentName + "TupleInput", "schemaProperty", sourceJsonPath); } } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 48adbc0421d..ab1680b9928 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -179,6 +179,7 @@ public JavaClientGenerator() { // and generated module must have the same parameter index as the spec sortParamsByRequiredFlag = Boolean.FALSE; objectIOClassNamePiece = "Map"; + arrayIOClassNamePiece = "List"; // TODO: Move GlobalFeature.ParameterizedServer to library: jersey after moving featureSet to generatorMetadata 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 b5afa4d36bc..a0970e25aaf 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 @@ -17,9 +17,15 @@ public static T validate(Map arg, SchemaCo {{/if}} {{/eq}} {{#eq this "array"}} + {{#if ../arrayOutputJsonPathPiece}} +public static {{../arrayOutputJsonPathPiece.camelCase}} validate(List arg, SchemaConfiguration configuration) { + return JsonSchema.validate({{#if includeContainer}}{{containerJsonPathPiece.camelCase}}.{{/if}}{{jsonPathPiece.camelCase}}.class, arg, configuration); +} + {{else}} public static U validate(List arg, SchemaConfiguration configuration) { return JsonSchema.validate({{#if includeContainer}}{{containerJsonPathPiece.camelCase}}.{{/if}}{{jsonPathPiece.camelCase}}.class, arg, configuration); } + {{/if}} {{/eq}} {{#eq this "string" }} {{#eq ../format "binary"}}