diff --git a/docs/generators/java.md b/docs/generators/java.md index f89b43aea16..06d6c0c90e9 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -224,7 +224,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ComponentParameters|✗|OAS3 |ComponentRequestBodies|✗|OAS3 |ComponentHeaders|✗|OAS3 -|ComponentSecuritySchemes|✗|OAS3 +|ComponentSecuritySchemes|✓|OAS3 |ComponentLinks|✗|OAS3 |ComponentCallbacks|✗|OAS3 |ComponentPathItems|✗|OAS3 @@ -238,7 +238,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |Paths|✗|OAS2,OAS3 |Webhooks|✗|OAS3 |Components|✓|OAS3 -|Security|✗|OAS2,OAS3 +|Security|✓|OAS2,OAS3 |Tags|✗|OAS2,OAS3 |ExternalDocs|✗|OAS2,OAS3 @@ -249,6 +249,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |Responses_RangedResponseCodes|✗|OAS3 |Responses_Default|✗|OAS3 |Responses_RedirectionResponse|✗|OAS3 +|Security|✓|OAS2,OAS3 +|Servers|✓|OAS3 ### Parameter Feature | Name | Supported | Defined By | diff --git a/docs/generators/python.md b/docs/generators/python.md index 30301bae273..09e0602888b 100644 --- a/docs/generators/python.md +++ b/docs/generators/python.md @@ -207,6 +207,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |Responses_RangedResponseCodes|✓|OAS3 |Responses_Default|✓|OAS3 |Responses_RedirectionResponse|✓|OAS3 +|Security|✓|OAS2,OAS3 +|Servers|✓|OAS3 ### Parameter Feature | Name | Supported | Defined By | diff --git a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES index d5c8ee62cc5..e49b5dc4068 100644 --- a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES +++ b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES @@ -185,13 +185,13 @@ src/main/java/org/openapijsonschematools/client/exceptions/InvalidTypeException. src/main/java/org/openapijsonschematools/client/exceptions/UnsetPropertyException.java src/main/java/org/openapijsonschematools/client/exceptions/ValidationException.java src/main/java/org/openapijsonschematools/client/schemas/AnyTypeJsonSchema.java -src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java src/main/java/org/openapijsonschematools/client/schemas/BooleanJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DateJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DateTimeJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DecimalJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java +src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java src/main/java/org/openapijsonschematools/client/schemas/Int32JsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/Int64JsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/IntJsonSchema.java diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java index 0f5ec0b47ed..c68a348b678 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java @@ -15,8 +15,8 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -225,7 +225,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForBar, SetterForAdditionalProperties { + public static class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder implements GenericBuilder>, SetterForFoo, SetterForBar, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java index 06b0e3e131e..61a4d5141c6 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -206,7 +206,7 @@ default T bar(Map value) { } } - public static class AdditionalpropertiesAreAllowedByDefaultMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForBar { + public static class AdditionalpropertiesAreAllowedByDefaultMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java index f588474640a..8c8cacb4506 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -72,7 +72,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class AdditionalpropertiesCanExistByItselfMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class AdditionalpropertiesCanExistByItselfMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java index e28137b0161..25dafdbacac 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java @@ -18,8 +18,8 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -144,7 +144,7 @@ default T foo(Map value) { } } - public static class Schema0MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class Schema0MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" @@ -400,7 +400,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java index bf9d6caa141..e67ffc66545 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -106,7 +106,7 @@ default T bar(double value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" @@ -391,7 +391,7 @@ default T foo(String value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java index 4d5465144b6..4f405ae3b61 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.NullJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -89,7 +89,7 @@ default T foo(String value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" @@ -374,7 +374,7 @@ default T baz(Void value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "baz" @@ -677,7 +677,7 @@ default T bar(double value) { } } - public static class AllofWithBaseSchemaMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class AllofWithBaseSchemaMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java index 4ad3b180512..e3a6a1b6abe 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -106,7 +106,7 @@ default T bar(double value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" @@ -391,7 +391,7 @@ default T foo(String value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java index 112941c723f..86e6c99f458 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -235,7 +235,7 @@ default T foo(StringFooEnums value) { } } - public static class EnumsInPropertiesMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class EnumsInPropertiesMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "bar", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java index ecf7d024f56..35ed039dbd7 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -133,7 +133,7 @@ default T foo(Map value) { } } - public static class ForbiddenPropertyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class ForbiddenPropertyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefault.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefault.java index 013bb5bfbfb..125085a905c 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefault.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefault.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -131,7 +131,7 @@ default T bar(String value) { } } - public static class InvalidStringValueForDefaultMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForBar { + public static class InvalidStringValueForDefaultMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "bar" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java index 4a61b83e150..eed001dab07 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -89,7 +89,7 @@ default T foo(String value) { } } - public static class NotMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class NotMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java index 62caf30a10c..7c454915546 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -141,7 +141,7 @@ default T bar(String value) { } } - public static class ObjectPropertiesValidationMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForBar { + public static class ObjectPropertiesValidationMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java index 6b1bde6902b..7c07343e49c 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -106,7 +106,7 @@ default T bar(double value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" @@ -391,7 +391,7 @@ default T foo(String value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java index ae9271ca7b4..d7bed7dbf93 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -182,7 +182,7 @@ default T foo(Map value) { } } - public static class Schema0Map00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar", @@ -592,7 +592,7 @@ default T foo(Map value) { } } - public static class Schema1Map00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "baz", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java index 9ea5c9b0d8c..765473545af 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -302,7 +302,7 @@ default T setFooReverseSolidusFbar(double value) { } } - public static class PropertiesWithEscapedCharactersMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoonbar, SetterForFoobar, SetterForFoobar1, SetterForFoorbar, SetterForFootbar, SetterForFoofbar { + public static class PropertiesWithEscapedCharactersMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoonbar, SetterForFoobar, SetterForFoobar1, SetterForFoorbar, SetterForFootbar, SetterForFoofbar { private final Map instance; private static final Set knownKeys = Set.of( "foo\nbar", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java index e50301c31c5..a6450992424 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -79,7 +79,7 @@ default T setDollarSignRef(String value) { } } - public static class PropertyNamedRefThatIsNotAReferenceMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForRef { + public static class PropertyNamedRefThatIsNotAReferenceMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForRef { private final Map instance; private static final Set knownKeys = Set.of( "$ref" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalproperties.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalproperties.java index 02aac8cc208..aea1d14ae21 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalproperties.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalproperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -111,7 +111,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class RefInAdditionalpropertiesMapBuilder implements BaseBuilder<@Nullable Object>, SetterForAdditionalProperties { + public static class RefInAdditionalpropertiesMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInProperty.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInProperty.java index 1026d6471b5..7659387db4d 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInProperty.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RefInProperty.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -125,7 +125,7 @@ default T a(Map value) { } } - public static class RefInPropertyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForA { + public static class RefInPropertyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForA { private final Map instance; private static final Set knownKeys = Set.of( "a" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java index ec4dd98cbda..9637841d7ab 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -131,7 +131,7 @@ default T foo(Map value) { } } - public static class RequiredDefaultValidationMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class RequiredDefaultValidationMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java index 9966d47b891..2278d43cdc6 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -207,7 +207,7 @@ default T bar(Map value) { } } - public static class RequiredValidationMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForBar { + public static class RequiredValidationMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java index 73a40c23db1..cb2a72fc7b6 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -131,7 +131,7 @@ default T foo(Map value) { } } - public static class RequiredWithEmptyArrayMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class RequiredWithEmptyArrayMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java index 1761d252b66..bd09b0e5289 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -414,7 +414,7 @@ default T setFooReverseSolidusReverseSolidusBar(Map value) { } } - public static class RequiredWithEscapedCharactersMap000000Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class RequiredWithEscapedCharactersMap000000Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo\tbar", diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.java index aa59ce4ae7a..260ae269b13 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -154,7 +154,7 @@ default T alpha(double value) { } } - public static class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForAlpha { + public static class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForAlpha { private final Map instance; private static final Set knownKeys = Set.of( "alpha" diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java similarity index 58% rename from samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java rename to samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java index da60908b3d6..b33d2e56600 100644 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java +++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java @@ -1,12 +1,9 @@ package org.openapijsonschematools.client.schemas; -import java.util.Map; - /** * Builders must implement this class - * For Map builders, * @param the type that the builder returns */ -public interface BaseBuilder { - Map build(); +public interface GenericBuilder { + T build(); } diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/InstanceGetter.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/InstanceGetter.java deleted file mode 100644 index 37b3779362a..00000000000 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/InstanceGetter.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.openapijsonschematools.client.schemas; - -/** - * Interface used by map builder setters - * @param the instance map - */ -public interface InstanceGetter { - T getInstance(); -} diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MapMaker.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MapMaker.java deleted file mode 100644 index 083b3d0f765..00000000000 --- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MapMaker.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.openapijsonschematools.client.schemas.validation; - -import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -public class MapMaker { - /** - * A builder for maps that allows in null values - * Schema tests + doc code samples need it - * @param entries items to add - * @return the output map - * @param key type - * @param value type - */ - @SafeVarargs - @SuppressWarnings("varargs") - public static Map makeMap(Map.Entry... entries) { - Map map = new HashMap<>(); - for (Map.Entry entry : entries) { - map.put(entry.getKey(), entry.getValue()); - } - return map; - } - - public static void throwIfKeyKnown(String key, Set knownKeys, boolean setting) throws InvalidAdditionalPropertyException { - if (knownKeys.contains(key)) { - String verb = "getting"; - if (setting) { - verb = "setting"; - } - throw new InvalidAdditionalPropertyException ("The known key " + key + " may not be passed in when "+verb+" an additional property"); - } - } -} \ No newline at end of file diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidateTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidateTest.java index 27ffcdea0e8..e78afe58438 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidateTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidateTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class AdditionalpropertiesAllowsASchemaWhichShouldValidateTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNoAdditionalPropertiesIsValidPasses() { // no additional properties is valid final var schema = AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidate1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", 1 ) @@ -32,7 +37,7 @@ public void testAnAdditionalValidPropertyIsValidPasses() { // an additional valid property is valid final var schema = AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidate1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -56,7 +61,7 @@ public void testAnAdditionalInvalidPropertyIsInvalidFails() { final var schema = AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidate1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefaultTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefaultTest.java index fcac7002a20..b279d9037a1 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefaultTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefaultTest.java @@ -1,21 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class AdditionalpropertiesAreAllowedByDefaultTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAdditionalPropertiesAreAllowedPasses() { // additional properties are allowed final var schema = AdditionalpropertiesAreAllowedByDefault.AdditionalpropertiesAreAllowedByDefault1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItselfTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItselfTest.java index 5fac684578e..8c8d5a930f8 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItselfTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItselfTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class AdditionalpropertiesCanExistByItselfTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAnAdditionalValidPropertyIsValidPasses() { // an additional valid property is valid final var schema = AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItself1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", true ) @@ -33,8 +38,8 @@ public void testAnAdditionalInvalidPropertyIsInvalidFails() { final var schema = AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItself1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", 1 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicatorsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicatorsTest.java index 87802e4f10b..576f44818fe 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicatorsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicatorsTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class AdditionalpropertiesShouldNotLookInApplicatorsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertiesDefinedInAllofAreNotExaminedFails() { @@ -18,7 +23,7 @@ public void testPropertiesDefinedInAllofAreNotExaminedFails() { final var schema = AdditionalpropertiesShouldNotLookInApplicators.AdditionalpropertiesShouldNotLookInApplicators1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -41,7 +46,7 @@ public void testValidTestCasePasses() { // valid test case final var schema = AdditionalpropertiesShouldNotLookInApplicators.AdditionalpropertiesShouldNotLookInApplicators1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", false diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofCombinedWithAnyofOneofTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofCombinedWithAnyofOneofTest.java index fc87f2b1c58..e32dd818973 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofCombinedWithAnyofOneofTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofCombinedWithAnyofOneofTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AllofCombinedWithAnyofOneofTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllofFalseAnyofFalseOneofTrueFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofSimpleTypesTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofSimpleTypesTest.java index 96d4eab52b6..6738af4533a 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofSimpleTypesTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofSimpleTypesTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AllofSimpleTypesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMismatchOneFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofTest.java index 5496583abdc..96ceb9d6354 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class AllofTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMismatchSecondFails() { @@ -18,8 +23,8 @@ public void testMismatchSecondFails() { final var schema = Allof.Allof1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "baz" ) @@ -38,7 +43,7 @@ public void testWrongTypeFails() { final var schema = Allof.Allof1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "baz" @@ -62,8 +67,8 @@ public void testMismatchFirstFails() { final var schema = Allof.Allof1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", 2 ) @@ -81,7 +86,7 @@ public void testAllofPasses() { // allOf final var schema = Allof.Allof1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "baz" diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchemaTest.java index 57ba152bf40..8b7da7ba706 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchemaTest.java @@ -1,17 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class AllofWithBaseSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMismatchBaseSchemaFails() { @@ -19,7 +23,7 @@ public void testMismatchBaseSchemaFails() { final var schema = AllofWithBaseSchema.AllofWithBaseSchema1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "quux" @@ -43,7 +47,7 @@ public void testMismatchFirstAllofFails() { final var schema = AllofWithBaseSchema.AllofWithBaseSchema1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "bar", 2 @@ -66,7 +70,7 @@ public void testValidPasses() { // valid final var schema = AllofWithBaseSchema.AllofWithBaseSchema1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "quux" @@ -90,8 +94,8 @@ public void testMismatchBothFails() { final var schema = AllofWithBaseSchema.AllofWithBaseSchema1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", 2 ) @@ -110,7 +114,7 @@ public void testMismatchSecondAllofFails() { final var schema = AllofWithBaseSchema.AllofWithBaseSchema1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "quux" diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithOneEmptySchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithOneEmptySchemaTest.java index be1268b9f56..4a51f3f1393 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithOneEmptySchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithOneEmptySchemaTest.java @@ -1,11 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AllofWithOneEmptySchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAnyDataIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheFirstEmptySchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheFirstEmptySchemaTest.java index b6de7989281..84351d8fbe9 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheFirstEmptySchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheFirstEmptySchemaTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AllofWithTheFirstEmptySchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testStringIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheLastEmptySchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheLastEmptySchemaTest.java index fdfeb41c92d..f0a11562d85 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheLastEmptySchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheLastEmptySchemaTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AllofWithTheLastEmptySchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testStringIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTwoEmptySchemasTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTwoEmptySchemasTest.java index cd1d293db49..b7bcf055a29 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTwoEmptySchemasTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTwoEmptySchemasTest.java @@ -1,11 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AllofWithTwoEmptySchemasTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAnyDataIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypesTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypesTest.java index 47e378fd4b1..a931b23d567 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypesTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypesTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class AnyofComplexTypesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testSecondAnyofValidComplexPasses() { // second anyOf valid (complex) final var schema = AnyofComplexTypes.AnyofComplexTypes1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "baz" ) @@ -32,7 +37,7 @@ public void testBothAnyofValidComplexPasses() { // both anyOf valid (complex) final var schema = AnyofComplexTypes.AnyofComplexTypes1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "baz" @@ -51,8 +56,8 @@ public void testFirstAnyofValidComplexPasses() { // first anyOf valid (complex) final var schema = AnyofComplexTypes.AnyofComplexTypes1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", 2 ) @@ -67,7 +72,7 @@ public void testNeitherAnyofValidComplexFails() { final var schema = AnyofComplexTypes.AnyofComplexTypes1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 2 diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofTest.java index ad0d58b29a1..ef97ff6dff1 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AnyofTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testBothAnyofValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithBaseSchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithBaseSchemaTest.java index 928ca39697b..b75095b0576 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithBaseSchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithBaseSchemaTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AnyofWithBaseSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMismatchBaseSchemaFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithOneEmptySchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithOneEmptySchemaTest.java index 78a1997cb83..8829498ffaa 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithOneEmptySchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithOneEmptySchemaTest.java @@ -1,11 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class AnyofWithOneEmptySchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNumberIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTypeMatchesArraysTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTypeMatchesArraysTest.java index 1bb569eec18..7320de65c06 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTypeMatchesArraysTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTypeMatchesArraysTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class ArrayTypeMatchesArraysTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testABooleanIsNotAnArrayFails() { @@ -47,10 +52,8 @@ public void testAnArrayIsAnArrayPasses() { // an array is an array final var schema = ArrayTypeMatchesArrays.ArrayTypeMatchesArrays1.getInstance(); schema.validate( - new ArrayTypeMatchesArrays.ArrayTypeMatchesArraysListBuilder( - Arrays.asList( - ) - ).build(), + new ArrayTypeMatchesArrays.ArrayTypeMatchesArraysListBuilder() + .build(), configuration ); } @@ -106,7 +109,7 @@ public void testAnObjectIsNotAnArrayFails() { final var schema = ArrayTypeMatchesArrays.ArrayTypeMatchesArrays1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanTypeMatchesBooleansTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanTypeMatchesBooleansTest.java index ea1b8dead5f..28095652c59 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanTypeMatchesBooleansTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanTypeMatchesBooleansTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class BooleanTypeMatchesBooleansTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAFloatIsNotABooleanFails() { @@ -68,7 +73,7 @@ public void testAnObjectIsNotABooleanFails() { final var schema = BooleanTypeMatchesBooleans.BooleanTypeMatchesBooleans1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByIntTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByIntTest.java index 1bc7cc4df3c..5238a51609e 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByIntTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByIntTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class ByIntTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testIntByIntFailFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByNumberTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByNumberTest.java index 584409819a3..c7a9bc144bd 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByNumberTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ByNumberTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class ByNumberTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void test35IsNotMultipleOf15Fails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BySmallNumberTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BySmallNumberTest.java index 36ca96be9e6..4bbf88c3921 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BySmallNumberTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/BySmallNumberTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class BySmallNumberTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void test000751IsNotMultipleOf00001Fails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeFormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeFormatTest.java index 57e4215fd18..a34d0f03faa 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeFormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeFormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class DateTimeFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = DateTimeFormat.DateTimeFormat1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EmailFormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EmailFormatTest.java index 5684350ba3c..e09400e1157 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EmailFormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EmailFormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class EmailFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = EmailFormat.EmailFormat1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith0DoesNotMatchFalseTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith0DoesNotMatchFalseTest.java index 5723980ba8b..3a72a8ab282 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith0DoesNotMatchFalseTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith0DoesNotMatchFalseTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class EnumWith0DoesNotMatchFalseTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testFloatZeroIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith1DoesNotMatchTrueTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith1DoesNotMatchTrueTest.java index 873b55bf44d..fbfeb797f7a 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith1DoesNotMatchTrueTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith1DoesNotMatchTrueTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class EnumWith1DoesNotMatchTrueTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testTrueIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithEscapedCharactersTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithEscapedCharactersTest.java index 5e11067d9bc..1b2fd92ec8e 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithEscapedCharactersTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithEscapedCharactersTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class EnumWithEscapedCharactersTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAnotherStringIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithFalseDoesNotMatch0Test.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithFalseDoesNotMatch0Test.java index 2b1cd31cbb9..4737d1537ac 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithFalseDoesNotMatch0Test.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithFalseDoesNotMatch0Test.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class EnumWithFalseDoesNotMatch0Test { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testFloatZeroIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithTrueDoesNotMatch1Test.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithTrueDoesNotMatch1Test.java index cf23733bec8..183135f6f0f 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithTrueDoesNotMatch1Test.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithTrueDoesNotMatch1Test.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class EnumWithTrueDoesNotMatch1Test { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testFloatOneIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumsInPropertiesTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumsInPropertiesTest.java index ab40fb8aa31..0917720a711 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumsInPropertiesTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumsInPropertiesTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class EnumsInPropertiesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testWrongBarValueFails() { @@ -18,7 +23,7 @@ public void testWrongBarValueFails() { final var schema = EnumsInProperties.EnumsInProperties1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "foo" @@ -42,7 +47,7 @@ public void testWrongFooValueFails() { final var schema = EnumsInProperties.EnumsInProperties1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "foot" @@ -66,7 +71,7 @@ public void testMissingAllPropertiesIsInvalidFails() { final var schema = EnumsInProperties.EnumsInProperties1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); @@ -81,7 +86,7 @@ public void testBothPropertiesAreValidPasses() { // both properties are valid final var schema = EnumsInProperties.EnumsInProperties1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "foo" @@ -100,8 +105,8 @@ public void testMissingOptionalPropertyIsValidPasses() { // missing optional property is valid final var schema = EnumsInProperties.EnumsInProperties1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", "bar" ) @@ -116,8 +121,8 @@ public void testMissingRequiredPropertyIsInvalidFails() { final var schema = EnumsInProperties.EnumsInProperties1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "foo" ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ForbiddenPropertyTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ForbiddenPropertyTest.java index b5bedf4c177..82ee3dc86a9 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ForbiddenPropertyTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ForbiddenPropertyTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class ForbiddenPropertyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyPresentFails() { @@ -18,7 +23,7 @@ public void testPropertyPresentFails() { final var schema = ForbiddenProperty.ForbiddenProperty1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -41,7 +46,7 @@ public void testPropertyAbsentPasses() { // property absent final var schema = ForbiddenProperty.ForbiddenProperty1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "bar", 1 diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/HostnameFormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/HostnameFormatTest.java index 2f482378328..28827e12a61 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/HostnameFormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/HostnameFormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class HostnameFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = HostnameFormat.HostnameFormat1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerTypeMatchesIntegersTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerTypeMatchesIntegersTest.java index 9b1309771c4..9bd3fc054a5 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerTypeMatchesIntegersTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerTypeMatchesIntegersTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class IntegerTypeMatchesIntegersTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAnObjectIsNotAnIntegerFails() { @@ -18,7 +23,7 @@ public void testAnObjectIsNotAnIntegerFails() { final var schema = IntegerTypeMatchesIntegers.IntegerTypeMatchesIntegers1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfTest.java index 21b29074396..9e11bdbcdb6 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAlwaysInvalidButNaiveImplementationsMayRaiseAnOverflowErrorFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefaultTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefaultTest.java index 4177e0a7879..3a4c529692d 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefaultTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefaultTest.java @@ -1,22 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class InvalidStringValueForDefaultTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testValidWhenPropertyIsSpecifiedPasses() { // valid when property is specified final var schema = InvalidStringValueForDefault.InvalidStringValueForDefault1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", "good" ) @@ -30,7 +37,7 @@ public void testStillValidWhenTheInvalidDefaultIsUsedPasses() { // still valid when the invalid default is used final var schema = InvalidStringValueForDefault.InvalidStringValueForDefault1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv4FormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv4FormatTest.java index 52e59f7ac7c..0397a32aae1 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv4FormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv4FormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class Ipv4FormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = Ipv4Format.Ipv4Format1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv6FormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv6FormatTest.java index 86e4fd00731..da110ec06c0 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv6FormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Ipv6FormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class Ipv6FormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = Ipv6Format.Ipv6Format1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/JsonPointerFormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/JsonPointerFormatTest.java index ac698496e09..37ac945057a 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/JsonPointerFormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/JsonPointerFormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class JsonPointerFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = JsonPointerFormat.JsonPointerFormat1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationTest.java index 9b7da501a07..060e7cbe47c 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MaximumValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAboveTheMaximumIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationWithUnsignedIntegerTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationWithUnsignedIntegerTest.java index 46d41a916a7..7de1376dc82 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationWithUnsignedIntegerTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationWithUnsignedIntegerTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MaximumValidationWithUnsignedIntegerTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAboveTheMaximumIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxitemsValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxitemsValidationTest.java index 1a73570dabc..f44118876b0 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxitemsValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxitemsValidationTest.java @@ -1,15 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MaxitemsValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testShorterIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxlengthValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxlengthValidationTest.java index 047ebba5562..441f220cf30 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxlengthValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxlengthValidationTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MaxlengthValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testShorterIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Maxproperties0MeansTheObjectIsEmptyTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Maxproperties0MeansTheObjectIsEmptyTest.java index c1769033469..203eab6db9a 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Maxproperties0MeansTheObjectIsEmptyTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/Maxproperties0MeansTheObjectIsEmptyTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class Maxproperties0MeansTheObjectIsEmptyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testOnePropertyIsInvalidFails() { @@ -18,8 +23,8 @@ public void testOnePropertyIsInvalidFails() { final var schema = Maxproperties0MeansTheObjectIsEmpty.Maxproperties0MeansTheObjectIsEmpty1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", 1 ) @@ -37,7 +42,7 @@ public void testNoPropertiesIsValidPasses() { // no properties is valid final var schema = Maxproperties0MeansTheObjectIsEmpty.Maxproperties0MeansTheObjectIsEmpty1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxpropertiesValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxpropertiesValidationTest.java index c6cad544be3..f0fae897e64 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxpropertiesValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MaxpropertiesValidationTest.java @@ -1,25 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class MaxpropertiesValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testShorterIsValidPasses() { // shorter is valid final var schema = MaxpropertiesValidation.MaxpropertiesValidation1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", 1 ) @@ -33,7 +37,7 @@ public void testExactLengthIsValidPasses() { // exact length is valid final var schema = MaxpropertiesValidation.MaxpropertiesValidation1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -53,7 +57,7 @@ public void testTooLongIsInvalidFails() { final var schema = MaxpropertiesValidation.MaxpropertiesValidation1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationTest.java index b05fd383316..938de6c0c23 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MinimumValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testBoundaryPointIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationWithSignedIntegerTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationWithSignedIntegerTest.java index ce85c216aeb..e5252c6c48a 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationWithSignedIntegerTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationWithSignedIntegerTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MinimumValidationWithSignedIntegerTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testBoundaryPointWithFloatIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinitemsValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinitemsValidationTest.java index 6d8ba2189fc..fe973599a5f 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinitemsValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinitemsValidationTest.java @@ -1,15 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MinitemsValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testExactLengthIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinlengthValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinlengthValidationTest.java index 71cf7ed63ae..8a0b2faf8f5 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinlengthValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinlengthValidationTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class MinlengthValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testExactLengthIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinpropertiesValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinpropertiesValidationTest.java index e239c8ac192..109b3b7fbfd 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinpropertiesValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/MinpropertiesValidationTest.java @@ -1,25 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class MinpropertiesValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testExactLengthIsValidPasses() { // exact length is valid final var schema = MinpropertiesValidation.MinpropertiesValidation1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", 1 ) @@ -43,7 +47,7 @@ public void testLongerIsValidPasses() { // longer is valid final var schema = MinpropertiesValidation.MinpropertiesValidation1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -74,7 +78,7 @@ public void testTooShortIsInvalidFails() { final var schema = MinpropertiesValidation.MinpropertiesValidation1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAllofToCheckValidationSemanticsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAllofToCheckValidationSemanticsTest.java index 197b10fbded..7f0e5197f48 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAllofToCheckValidationSemanticsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAllofToCheckValidationSemanticsTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NestedAllofToCheckValidationSemanticsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNullIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAnyofToCheckValidationSemanticsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAnyofToCheckValidationSemanticsTest.java index 9782ff42c06..40c68fea595 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAnyofToCheckValidationSemanticsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedAnyofToCheckValidationSemanticsTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NestedAnyofToCheckValidationSemanticsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNullIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedItemsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedItemsTest.java index 58d14a94de4..a730cd66895 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedItemsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedItemsTest.java @@ -1,15 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NestedItemsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNestedArrayWithInvalidTypeFails() { @@ -98,8 +104,8 @@ public void testValidNestedArrayPasses() { // valid nested array final var schema = NestedItems.NestedItems1.getInstance(); schema.validate( - new NestedItems.NestedItemsListBuilder( - Arrays.asList( + new NestedItems.NestedItemsListBuilder() + .add( Arrays.asList( Arrays.asList( Arrays.asList( @@ -114,7 +120,9 @@ public void testValidNestedArrayPasses() { 3 ) ) - ), + ) + ) + .add( Arrays.asList( Arrays.asList( Arrays.asList( @@ -129,7 +137,7 @@ public void testValidNestedArrayPasses() { ) ) ) - ).build(), + .build(), configuration ); } diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedOneofToCheckValidationSemanticsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedOneofToCheckValidationSemanticsTest.java index 911f1e2258a..e16c8bc3373 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedOneofToCheckValidationSemanticsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NestedOneofToCheckValidationSemanticsTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NestedOneofToCheckValidationSemanticsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNullIsValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchemaTest.java index af1a480be8c..d3fbe75257c 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchemaTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class NotMoreComplexSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testOtherMatchPasses() { // other match final var schema = NotMoreComplexSchema.NotMoreComplexSchema1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", 1 ) @@ -33,8 +38,8 @@ public void testMismatchFails() { final var schema = NotMoreComplexSchema.NotMoreComplexSchema1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "bar" ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotTest.java index 14c9d128745..bc2bc52984c 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NotTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NotTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testDisallowedFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NulCharactersInStringsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NulCharactersInStringsTest.java index 2f62454b504..fb754a14c5f 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NulCharactersInStringsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NulCharactersInStringsTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NulCharactersInStringsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMatchStringWithNulPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullTypeMatchesOnlyTheNullObjectTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullTypeMatchesOnlyTheNullObjectTest.java index e29cdf4b56e..637d7878b59 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullTypeMatchesOnlyTheNullObjectTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullTypeMatchesOnlyTheNullObjectTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NullTypeMatchesOnlyTheNullObjectTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testZeroIsNotNullFails() { @@ -49,7 +54,7 @@ public void testAnObjectIsNotNullFails() { final var schema = NullTypeMatchesOnlyTheNullObject.NullTypeMatchesOnlyTheNullObject1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberTypeMatchesNumbersTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberTypeMatchesNumbersTest.java index e740666c803..7158fd026db 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberTypeMatchesNumbersTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberTypeMatchesNumbersTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class NumberTypeMatchesNumbersTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAFloatIsANumberPasses() { @@ -124,7 +129,7 @@ public void testAnObjectIsNotANumberFails() { final var schema = NumberTypeMatchesNumbers.NumberTypeMatchesNumbers1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidationTest.java index 4c6861238a4..46aef85c136 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidationTest.java @@ -1,24 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class ObjectPropertiesValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testBothPropertiesPresentAndValidIsValidPasses() { // both properties present and valid is valid final var schema = ObjectPropertiesValidation.ObjectPropertiesValidation1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -37,8 +41,8 @@ public void testDoesnTInvalidateOtherPropertiesPasses() { // doesn't invalidate other properties final var schema = ObjectPropertiesValidation.ObjectPropertiesValidation1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "quux", Arrays.asList( ) @@ -64,7 +68,7 @@ public void testBothPropertiesInvalidIsInvalidFails() { final var schema = ObjectPropertiesValidation.ObjectPropertiesValidation1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", Arrays.asList( @@ -72,7 +76,7 @@ public void testBothPropertiesInvalidIsInvalidFails() { ), new AbstractMap.SimpleEntry( "bar", - MapMaker.makeMap( + MapUtils.makeMap( ) ) ), @@ -101,14 +105,14 @@ public void testOnePropertyInvalidIsInvalidFails() { final var schema = ObjectPropertiesValidation.ObjectPropertiesValidation1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 ), new AbstractMap.SimpleEntry( "bar", - MapMaker.makeMap( + MapUtils.makeMap( ) ) ), diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectTypeMatchesObjectsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectTypeMatchesObjectsTest.java index cb9f921066f..0d4f932b859 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectTypeMatchesObjectsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectTypeMatchesObjectsTest.java @@ -1,23 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class ObjectTypeMatchesObjectsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAnObjectIsAnObjectPasses() { // an object is an object final var schema = ObjectTypeMatchesObjects.ObjectTypeMatchesObjects1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypesTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypesTest.java index 82e0f038cb1..46cabdaf335 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypesTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypesTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class OneofComplexTypesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testSecondOneofValidComplexPasses() { // second oneOf valid (complex) final var schema = OneofComplexTypes.OneofComplexTypes1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "baz" ) @@ -33,7 +38,7 @@ public void testBothOneofValidComplexFails() { final var schema = OneofComplexTypes.OneofComplexTypes1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", "baz" @@ -56,8 +61,8 @@ public void testFirstOneofValidComplexPasses() { // first oneOf valid (complex) final var schema = OneofComplexTypes.OneofComplexTypes1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", 2 ) @@ -72,7 +77,7 @@ public void testNeitherOneofValidComplexFails() { final var schema = OneofComplexTypes.OneofComplexTypes1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 2 diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofTest.java index fafd4ed4f18..4aafad49183 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class OneofTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testBothOneofValidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithBaseSchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithBaseSchemaTest.java index 23e81b1c913..2dfe72cd7fa 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithBaseSchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithBaseSchemaTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class OneofWithBaseSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMismatchBaseSchemaFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithEmptySchemaTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithEmptySchemaTest.java index abe8760d146..4500ca75474 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithEmptySchemaTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithEmptySchemaTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class OneofWithEmptySchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testOneValidValidPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithRequiredTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithRequiredTest.java index 08b2db53b4f..fed6deab27e 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithRequiredTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithRequiredTest.java @@ -1,23 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class OneofWithRequiredTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testFirstValidValidPasses() { // first valid - valid final var schema = OneofWithRequired.OneofWithRequired1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -37,7 +42,7 @@ public void testBothValidInvalidFails() { final var schema = OneofWithRequired.OneofWithRequired1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -64,7 +69,7 @@ public void testSecondValidValidPasses() { // second valid - valid final var schema = OneofWithRequired.OneofWithRequired1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo", 1 @@ -84,8 +89,8 @@ public void testBothInvalidInvalidFails() { final var schema = OneofWithRequired.OneofWithRequired1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternIsNotAnchoredTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternIsNotAnchoredTest.java index 450757ef08b..70153cd7cb5 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternIsNotAnchoredTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternIsNotAnchoredTest.java @@ -1,11 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class PatternIsNotAnchoredTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMatchesASubstringPasses() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternValidationTest.java index 6260fcb32b3..fc5ff8000e3 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PatternValidationTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class PatternValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testIgnoresBooleansPasses() { @@ -83,7 +88,7 @@ public void testIgnoresObjectsPasses() { // ignores objects final var schema = PatternValidation.PatternValidation1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharactersTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharactersTest.java index a2c403d2468..d394de1e6ed 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharactersTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharactersTest.java @@ -1,23 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class PropertiesWithEscapedCharactersTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testObjectWithAllNumbersIsValidPasses() { // object with all numbers is valid final var schema = PropertiesWithEscapedCharacters.PropertiesWithEscapedCharacters1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo\nbar", 1 @@ -53,7 +58,7 @@ public void testObjectWithStringsIsInvalidFails() { final var schema = PropertiesWithEscapedCharacters.PropertiesWithEscapedCharacters1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo\nbar", "1" diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReferenceTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReferenceTest.java index bc4f41b2ea0..70412b8ca3f 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReferenceTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReferenceTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class PropertyNamedRefThatIsNotAReferenceTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = PropertyNamedRefThatIsNotAReference.PropertyNamedRefThatIsNotAReference1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) @@ -33,8 +38,8 @@ public void testPropertyNamedRefInvalidFails() { final var schema = PropertyNamedRefThatIsNotAReference.PropertyNamedRefThatIsNotAReference1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalpropertiesTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalpropertiesTest.java index d5e6b364bbd..3fc09b3946b 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalpropertiesTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalpropertiesTest.java @@ -1,27 +1,32 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RefInAdditionalpropertiesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = RefInAdditionalproperties.RefInAdditionalproperties1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "someProp", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) @@ -38,11 +43,11 @@ public void testPropertyNamedRefInvalidFails() { final var schema = RefInAdditionalproperties.RefInAdditionalproperties1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "someProp", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAllofTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAllofTest.java index d19b9fed66a..2f49c75fa81 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAllofTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAllofTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RefInAllofTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = RefInAllof.RefInAllof1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) @@ -33,8 +38,8 @@ public void testPropertyNamedRefInvalidFails() { final var schema = RefInAllof.RefInAllof1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAnyofTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAnyofTest.java index 94ed6250a10..c4199877c08 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAnyofTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInAnyofTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RefInAnyofTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = RefInAnyof.RefInAnyof1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) @@ -33,8 +38,8 @@ public void testPropertyNamedRefInvalidFails() { final var schema = RefInAnyof.RefInAnyof1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInItemsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInItemsTest.java index f731935e71d..239677fb66b 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInItemsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInItemsTest.java @@ -1,33 +1,37 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RefInItemsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = RefInItems.RefInItems1.getInstance(); schema.validate( - new RefInItems.RefInItemsListBuilder( - Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + new RefInItems.RefInItemsListBuilder() + .add( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) ) ) - ).build(), + .build(), configuration ); } @@ -39,8 +43,8 @@ public void testPropertyNamedRefInvalidFails() { try { schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInNotTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInNotTest.java index 770ea987df3..7a68dc4be5f 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInNotTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInNotTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RefInNotTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = RefInNot.RefInNot1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) @@ -33,8 +38,8 @@ public void testPropertyNamedRefInvalidFails() { final var schema = RefInNot.RefInNot1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInOneofTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInOneofTest.java index 9a46363b42b..e8555cad3f3 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInOneofTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInOneofTest.java @@ -1,24 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RefInOneofTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = RefInOneof.RefInOneof1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) @@ -33,8 +38,8 @@ public void testPropertyNamedRefInvalidFails() { final var schema = RefInOneof.RefInOneof1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInPropertyTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInPropertyTest.java index 8d222d1e55f..65cfaad0251 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInPropertyTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefInPropertyTest.java @@ -1,27 +1,32 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RefInPropertyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNamedRefValidPasses() { // property named $ref valid final var schema = RefInProperty.RefInProperty1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "a", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", "a" ) @@ -38,11 +43,11 @@ public void testPropertyNamedRefInvalidFails() { final var schema = RefInProperty.RefInProperty1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "a", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "$ref", 2 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidationTest.java index 4d1c328e73f..b439c59a44b 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidationTest.java @@ -1,19 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class RequiredDefaultValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNotRequiredByDefaultPasses() { // not required by default final var schema = RequiredDefaultValidation.RequiredDefaultValidation1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredValidationTest.java index 98a24f5fa23..3757ebf8c49 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredValidationTest.java @@ -1,25 +1,29 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RequiredValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPresentRequiredPropertyIsValidPasses() { // present required property is valid final var schema = RequiredValidation.RequiredValidation1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", 1 ) @@ -65,8 +69,8 @@ public void testNonPresentRequiredPropertyIsInvalidFails() { final var schema = RequiredValidation.RequiredValidation1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "bar", 1 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArrayTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArrayTest.java index 3a3d33ef75a..d6a8add1e4c 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArrayTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArrayTest.java @@ -1,19 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class RequiredWithEmptyArrayTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testPropertyNotRequiredPasses() { // property not required final var schema = RequiredWithEmptyArray.RequiredWithEmptyArray1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharactersTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharactersTest.java index a1281b4e989..a2c05a6f22e 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharactersTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharactersTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class RequiredWithEscapedCharactersTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testObjectWithSomePropertiesMissingIsInvalidFails() { @@ -18,7 +23,7 @@ public void testObjectWithSomePropertiesMissingIsInvalidFails() { final var schema = RequiredWithEscapedCharacters.RequiredWithEscapedCharacters1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo\nbar", "1" @@ -41,7 +46,7 @@ public void testObjectWithAllPropertiesPresentIsValidPasses() { // object with all properties present is valid final var schema = RequiredWithEscapedCharacters.RequiredWithEscapedCharacters1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "foo\nbar", 1 diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleEnumValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleEnumValidationTest.java index dba0d576963..53f95f8e48e 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleEnumValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleEnumValidationTest.java @@ -1,13 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class SimpleEnumValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testSomethingElseIsInvalidFails() { diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringTypeMatchesStringsTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringTypeMatchesStringsTest.java index f0bbbff7f07..226c06bc19f 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringTypeMatchesStringsTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringTypeMatchesStringsTest.java @@ -1,16 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class StringTypeMatchesStringsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAStringIsStillAStringEvenIfItLooksLikeANumberPasses() { @@ -84,7 +89,7 @@ public void testAnObjectIsNotAStringFails() { final var schema = StringTypeMatchesStrings.StringTypeMatchesStrings1.getInstance(); try { schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingTest.java index 18638c8ea7a..6b63fd753ce 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingTest.java @@ -1,23 +1,28 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testMissingPropertiesAreNotFilledInWithTheDefaultPasses() { // missing properties are not filled in with the default final var schema = TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); @@ -28,8 +33,8 @@ public void testAnExplicitPropertyValueIsCheckedAgainstMaximumPassingPasses() { // an explicit property value is checked against maximum (passing) final var schema = TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing1.getInstance(); schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "alpha", 1 ) @@ -44,8 +49,8 @@ public void testAnExplicitPropertyValueIsCheckedAgainstMaximumFailingFails() { final var schema = TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing1.getInstance(); try { schema.validate( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "alpha", 5 ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsFalseValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsFalseValidationTest.java index d20c5a00b1b..5c0b5aaaeea 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsFalseValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsFalseValidationTest.java @@ -1,15 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class UniqueitemsFalseValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNumbersAreUniqueIfMathematicallyUnequalPasses() { @@ -44,14 +50,14 @@ public void testNonUniqueArrayOfObjectsIsValidPasses() { final var schema = UniqueitemsFalseValidation.UniqueitemsFalseValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "bar" ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "bar" ) @@ -97,14 +103,14 @@ public void testUniqueArrayOfNestedObjectsIsValidPasses() { final var schema = UniqueitemsFalseValidation.UniqueitemsFalseValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", true ) @@ -113,14 +119,14 @@ public void testUniqueArrayOfNestedObjectsIsValidPasses() { ) ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", false ) @@ -170,14 +176,14 @@ public void testNonUniqueHeterogeneousTypesAreValidPasses() { final var schema = UniqueitemsFalseValidation.UniqueitemsFalseValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( + MapUtils.makeMap( ), Arrays.asList( 1 ), true, null, - MapMaker.makeMap( + MapUtils.makeMap( ), 1 ), @@ -230,7 +236,7 @@ public void testUniqueHeterogeneousTypesAreValidPasses() { final var schema = UniqueitemsFalseValidation.UniqueitemsFalseValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( + MapUtils.makeMap( ), Arrays.asList( 1 @@ -249,14 +255,14 @@ public void testUniqueArrayOfObjectsIsValidPasses() { final var schema = UniqueitemsFalseValidation.UniqueitemsFalseValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "bar" ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "baz" ) @@ -272,14 +278,14 @@ public void testNonUniqueArrayOfNestedObjectsIsValidPasses() { final var schema = UniqueitemsFalseValidation.UniqueitemsFalseValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", true ) @@ -288,14 +294,14 @@ public void testNonUniqueArrayOfNestedObjectsIsValidPasses() { ) ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", true ) diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsValidationTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsValidationTest.java index 911984f48ad..6f6fba93a47 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsValidationTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsValidationTest.java @@ -1,17 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; import java.util.AbstractMap; public class UniqueitemsValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testNonUniqueArrayOfMoreThanTwoIntegersIsInvalidFails() { @@ -39,14 +43,14 @@ public void testNonUniqueArrayOfObjectsIsInvalidFails() { try { schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "bar" ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "bar" ) @@ -66,14 +70,14 @@ public void testATrueAndA1AreUniquePasses() { final var schema = UniqueitemsValidation.UniqueitemsValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "a", true ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "a", 1 ) @@ -148,7 +152,7 @@ public void testObjectsAreNonUniqueDespiteKeyOrderFails() { try { schema.validate( Arrays.asList( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "a", 1 @@ -158,7 +162,7 @@ public void testObjectsAreNonUniqueDespiteKeyOrderFails() { 2 ) ), - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "b", 2 @@ -205,14 +209,14 @@ public void testAFalseAndA0AreUniquePasses() { final var schema = UniqueitemsValidation.UniqueitemsValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "a", false ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "a", 0 ) @@ -271,14 +275,14 @@ public void testNonUniqueArrayOfNestedObjectsIsInvalidFails() { try { schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", true ) @@ -287,14 +291,14 @@ public void testNonUniqueArrayOfNestedObjectsIsInvalidFails() { ) ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", true ) @@ -356,14 +360,14 @@ public void testUniqueArrayOfNestedObjectsIsValidPasses() { final var schema = UniqueitemsValidation.UniqueitemsValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", true ) @@ -372,14 +376,14 @@ public void testUniqueArrayOfNestedObjectsIsValidPasses() { ) ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "foo", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry>( "bar", - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "baz", false ) @@ -492,7 +496,7 @@ public void testDifferentObjectsAreUniquePasses() { final var schema = UniqueitemsValidation.UniqueitemsValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "a", 1 @@ -502,7 +506,7 @@ public void testDifferentObjectsAreUniquePasses() { 2 ) ), - MapMaker.makeMap( + MapUtils.makeMap( new AbstractMap.SimpleEntry( "a", 2 @@ -523,7 +527,7 @@ public void testUniqueHeterogeneousTypesAreValidPasses() { final var schema = UniqueitemsValidation.UniqueitemsValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( + MapUtils.makeMap( ), Arrays.asList( 1 @@ -543,14 +547,14 @@ public void testUniqueArrayOfObjectsIsValidPasses() { final var schema = UniqueitemsValidation.UniqueitemsValidation1.getInstance(); schema.validate( Arrays.asList( - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "bar" ) ), - MapMaker.makeMap( - new AbstractMap.SimpleEntry<>( + MapUtils.makeMap( + new AbstractMap.SimpleEntry( "foo", "baz" ) @@ -567,14 +571,14 @@ public void testNonUniqueHeterogeneousTypesAreInvalidFails() { try { schema.validate( Arrays.asList( - MapMaker.makeMap( + MapUtils.makeMap( ), Arrays.asList( 1 ), true, null, - MapMaker.makeMap( + MapUtils.makeMap( ), 1 ), diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriFormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriFormatTest.java index 770584ab9b5..14ce5c09bd2 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriFormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriFormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class UriFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = UriFormat.UriFormat1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriReferenceFormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriReferenceFormatTest.java index 89626cda605..9ae84cd3823 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriReferenceFormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriReferenceFormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class UriReferenceFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = UriReferenceFormat.UriReferenceFormat1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriTemplateFormatTest.java b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriTemplateFormatTest.java index 3cdb750eeff..cb29e46630f 100644 --- a/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriTemplateFormatTest.java +++ b/samples/client/3_0_3_unit_test/java/src/test/java/org/openapijsonschematools/client/components/schemas/UriTemplateFormatTest.java @@ -1,14 +1,21 @@ package org.openapijsonschematools.client.components.schemas; +import org.junit.Assert; import org.junit.Test; import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.schemas.validation.MapMaker; +import org.openapijsonschematools.client.exceptions.ValidationException; +import org.openapijsonschematools.client.exceptions.InvalidTypeException; +import org.openapijsonschematools.client.schemas.validation.MapUtils; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; public class UriTemplateFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); @Test public void testAllStringFormatsIgnoreIntegersPasses() { @@ -35,7 +42,7 @@ public void testAllStringFormatsIgnoreObjectsPasses() { // all string formats ignore objects final var schema = UriTemplateFormat.UriTemplateFormat1.getInstance(); schema.validate( - MapMaker.makeMap( + MapUtils.makeMap( ), configuration ); diff --git a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES index a7cc708c990..25f8c07409f 100644 --- a/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES +++ b/samples/client/3_1_0_unit_test/java/.openapi-generator/FILES @@ -297,13 +297,13 @@ src/main/java/org/openapijsonschematools/client/exceptions/InvalidTypeException. src/main/java/org/openapijsonschematools/client/exceptions/UnsetPropertyException.java src/main/java/org/openapijsonschematools/client/exceptions/ValidationException.java src/main/java/org/openapijsonschematools/client/schemas/AnyTypeJsonSchema.java -src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java src/main/java/org/openapijsonschematools/client/schemas/BooleanJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DateJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DateTimeJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DecimalJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java +src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java src/main/java/org/openapijsonschematools/client/schemas/Int32JsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/Int64JsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/IntJsonSchema.java diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java index 06b0e3e131e..61a4d5141c6 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -206,7 +206,7 @@ default T bar(Map value) { } } - public static class AdditionalpropertiesAreAllowedByDefaultMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForBar { + public static class AdditionalpropertiesAreAllowedByDefaultMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java index f588474640a..8c8cacb4506 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItself.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -72,7 +72,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class AdditionalpropertiesCanExistByItselfMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class AdditionalpropertiesCanExistByItselfMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesDoesNotLookInApplicators.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesDoesNotLookInApplicators.java index 61503e61d5b..30535037761 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesDoesNotLookInApplicators.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesDoesNotLookInApplicators.java @@ -18,8 +18,8 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -144,7 +144,7 @@ default T foo(Map value) { } } - public static class Schema0MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class Schema0MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" @@ -400,7 +400,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class AdditionalpropertiesDoesNotLookInApplicatorsMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class AdditionalpropertiesDoesNotLookInApplicatorsMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithNullValuedInstanceProperties.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithNullValuedInstanceProperties.java index 65c44aa6c50..2db48004172 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithNullValuedInstanceProperties.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithNullValuedInstanceProperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NullJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -67,7 +67,7 @@ default T additionalProperty(String key, Void value) throws InvalidAdditionalPro } } - public static class AdditionalpropertiesWithNullValuedInstancePropertiesMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class AdditionalpropertiesWithNullValuedInstancePropertiesMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithSchema.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithSchema.java index b2ee54a0287..e9bc579e5ca 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithSchema.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesWithSchema.java @@ -15,8 +15,8 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -225,7 +225,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class AdditionalpropertiesWithSchemaMapBuilder implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForBar, SetterForAdditionalProperties { + public static class AdditionalpropertiesWithSchemaMapBuilder implements GenericBuilder>, SetterForFoo, SetterForBar, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java index bf9d6caa141..e67ffc66545 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/Allof.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -106,7 +106,7 @@ default T bar(double value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" @@ -391,7 +391,7 @@ default T foo(String value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java index 4d5465144b6..4f405ae3b61 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchema.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.NullJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -89,7 +89,7 @@ default T foo(String value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" @@ -374,7 +374,7 @@ default T baz(Void value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "baz" @@ -677,7 +677,7 @@ default T bar(double value) { } } - public static class AllofWithBaseSchemaMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class AllofWithBaseSchemaMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java index 4ad3b180512..e3a6a1b6abe 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypes.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -106,7 +106,7 @@ default T bar(double value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" @@ -391,7 +391,7 @@ default T foo(String value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependenciesWithEscapedCharacters.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependenciesWithEscapedCharacters.java index 2376c8c24eb..ecea496f16a 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependenciesWithEscapedCharacters.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependenciesWithEscapedCharacters.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -310,7 +310,7 @@ default T setFooReverseSolidusQuotationMarkBar(Map value) { } } - public static class FoobarMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class FoobarMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo\"bar" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependentSubschemaIncompatibleWithRoot.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependentSubschemaIncompatibleWithRoot.java index 87021a32d04..283cfba2143 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependentSubschemaIncompatibleWithRoot.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasDependentSubschemaIncompatibleWithRoot.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -139,7 +139,7 @@ default T bar(Map value) { } } - public static class FooMapBuilder1 implements BaseBuilder<@Nullable Object>, SetterForBar { + public static class FooMapBuilder1 implements GenericBuilder>, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "bar" @@ -326,7 +326,7 @@ default T foo(Map value) { } } - public static class DependentSchemasDependentSubschemaIncompatibleWithRootMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class DependentSchemasDependentSubschemaIncompatibleWithRootMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasSingleDependency.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasSingleDependency.java index 04546052a49..4eba8eeeeee 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasSingleDependency.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/DependentSchemasSingleDependency.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -158,7 +158,7 @@ default T bar(double value) { } } - public static class BarMapBuilder1 extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForBar1 { + public static class BarMapBuilder1 extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo, SetterForBar1 { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java index 112941c723f..86e6c99f458 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumsInProperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -235,7 +235,7 @@ default T foo(StringFooEnums value) { } } - public static class EnumsInPropertiesMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class EnumsInPropertiesMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "bar", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java index c63ced55fd6..5cc0171a63f 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ForbiddenProperty.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -326,7 +326,7 @@ default T foo(Map value) { } } - public static class ForbiddenPropertyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class ForbiddenPropertyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonAsciiPatternWithAdditionalproperties.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonAsciiPatternWithAdditionalproperties.java index 3eb3d9f2ecc..59b95bfcaad 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonAsciiPatternWithAdditionalproperties.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonAsciiPatternWithAdditionalproperties.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -64,7 +64,7 @@ public static NonAsciiPatternWithAdditionalpropertiesMap of(Map { + public static class NonAsciiPatternWithAdditionalpropertiesMapBuilder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java index 4a61b83e150..eed001dab07 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchema.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -89,7 +89,7 @@ default T foo(String value) { } } - public static class NotMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class NotMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java index 62caf30a10c..7c454915546 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidation.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -141,7 +141,7 @@ default T bar(String value) { } } - public static class ObjectPropertiesValidationMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForBar { + public static class ObjectPropertiesValidationMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java index 6b1bde6902b..7c07343e49c 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypes.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -106,7 +106,7 @@ default T bar(double value) { } } - public static class Schema0Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar" @@ -391,7 +391,7 @@ default T foo(String value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java index ae9271ca7b4..d7bed7dbf93 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/OneofWithRequired.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -182,7 +182,7 @@ default T foo(Map value) { } } - public static class Schema0Map00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema0Map00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "bar", @@ -592,7 +592,7 @@ default T foo(Map value) { } } - public static class Schema1Map00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class Schema1Map00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "baz", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesPatternpropertiesAdditionalpropertiesInteraction.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesPatternpropertiesAdditionalpropertiesInteraction.java index 756dca96e07..4e6fc64d322 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesPatternpropertiesAdditionalpropertiesInteraction.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesPatternpropertiesAdditionalpropertiesInteraction.java @@ -19,7 +19,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.ListJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -421,7 +421,7 @@ default T additionalProperty(String key, double value) throws InvalidAdditionalP } } - public static class PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder implements BaseBuilder, SetterForFoo, SetterForBar, SetterForAdditionalProperties { + public static class PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder implements GenericBuilder>, SetterForFoo, SetterForBar, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java index 29981042655..dc09df573eb 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -101,7 +101,7 @@ default T length(String value) { } } - public static class ToStringMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForLength { + public static class ToStringMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForLength { private final Map instance; private static final Set knownKeys = Set.of( "length" @@ -483,7 +483,7 @@ default T constructor(double value) { } } - public static class PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForProto, SetterForToStringSchema, SetterForConstructor { + public static class PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForProto, SetterForToStringSchema, SetterForConstructor { private final Map instance; private static final Set knownKeys = Set.of( "__proto__", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java index 9ea5c9b0d8c..765473545af 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharacters.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -302,7 +302,7 @@ default T setFooReverseSolidusFbar(double value) { } } - public static class PropertiesWithEscapedCharactersMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoonbar, SetterForFoobar, SetterForFoobar1, SetterForFoorbar, SetterForFootbar, SetterForFoofbar { + public static class PropertiesWithEscapedCharactersMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoonbar, SetterForFoobar, SetterForFoobar1, SetterForFoorbar, SetterForFootbar, SetterForFoofbar { private final Map instance; private static final Set knownKeys = Set.of( "foo\nbar", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithNullValuedInstanceProperties.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithNullValuedInstanceProperties.java index db154103d72..ed974755b26 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithNullValuedInstanceProperties.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWithNullValuedInstanceProperties.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NullJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -89,7 +89,7 @@ default T foo(Void value) { } } - public static class PropertiesWithNullValuedInstancePropertiesMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class PropertiesWithNullValuedInstancePropertiesMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java index e50301c31c5..a6450992424 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReference.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -79,7 +79,7 @@ default T setDollarSignRef(String value) { } } - public static class PropertyNamedRefThatIsNotAReferenceMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForRef { + public static class PropertyNamedRefThatIsNotAReferenceMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForRef { private final Map instance; private static final Set knownKeys = Set.of( "$ref" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java index ec4dd98cbda..9637841d7ab 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidation.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -131,7 +131,7 @@ default T foo(Map value) { } } - public static class RequiredDefaultValidationMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class RequiredDefaultValidationMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java index 840ca994b8f..18c063004b1 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -238,7 +238,7 @@ default T setToString(Map value) { } } - public static class RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "__proto__", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java index 9966d47b891..2278d43cdc6 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredValidation.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -207,7 +207,7 @@ default T bar(Map value) { } } - public static class RequiredValidationMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForBar { + public static class RequiredValidationMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "foo", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java index 73a40c23db1..cb2a72fc7b6 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArray.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -131,7 +131,7 @@ default T foo(Map value) { } } - public static class RequiredWithEmptyArrayMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFoo { + public static class RequiredWithEmptyArrayMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java index 1761d252b66..bd09b0e5289 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharacters.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -414,7 +414,7 @@ default T setFooReverseSolidusReverseSolidusBar(Map value) { } } - public static class RequiredWithEscapedCharactersMap000000Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class RequiredWithEscapedCharactersMap000000Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "foo\tbar", diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/UnevaluatedpropertiesWithAdjacentAdditionalproperties.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/UnevaluatedpropertiesWithAdjacentAdditionalproperties.java index be03caf59ea..6c3ff714350 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/UnevaluatedpropertiesWithAdjacentAdditionalproperties.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/UnevaluatedpropertiesWithAdjacentAdditionalproperties.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -161,7 +161,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class UnevaluatedpropertiesWithAdjacentAdditionalpropertiesMapBuilder implements BaseBuilder<@Nullable Object>, SetterForFoo, SetterForAdditionalProperties { + public static class UnevaluatedpropertiesWithAdjacentAdditionalpropertiesMapBuilder implements GenericBuilder>, SetterForFoo, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "foo" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java similarity index 58% rename from samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java rename to samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java index da60908b3d6..b33d2e56600 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java @@ -1,12 +1,9 @@ package org.openapijsonschematools.client.schemas; -import java.util.Map; - /** * Builders must implement this class - * For Map builders, * @param the type that the builder returns */ -public interface BaseBuilder { - Map build(); +public interface GenericBuilder { + T build(); } diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index 10c50e03123..2e977aa6684 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -500,6 +500,7 @@ src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/paramete src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter0/Schema0.java @@ -508,6 +509,7 @@ src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/par src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter3/Schema3.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter4/Schema4.java src/main/java/org/openapijsonschematools/client/paths/fake/delete/parameters/parameter5/Schema5.java +src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fake/get/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter0/Schema0.java @@ -519,7 +521,9 @@ src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parame src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java src/main/java/org/openapijsonschematools/client/paths/fake/get/responses/response404/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/fake/patch/responses/response200/content/applicationjson/Schema.java +src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java +src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fakeadditionalpropertieswitharrayofenums/get/requestbody/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/fakeadditionalpropertieswitharrayofenums/get/responses/response200/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/fakebodywithfileschema/put/requestbody/content/applicationjson/Schema.java @@ -530,7 +534,9 @@ src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/pu src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter1/Schema1.java src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/parameters/parameter2/Schema2.java +src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/responses/response200/content/applicationjson/Schema.java +src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakehealth/get/responses/response200/content/applicationjson/Schema.java @@ -551,7 +557,11 @@ src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycon src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/responses/response200/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/fakemultipleresponsebodies/get/responses/response200/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/fakemultipleresponsebodies/get/responses/response202/content/applicationjson/Schema.java +src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/responses/response200/content/applicationjson/Schema.java +src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java +src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java @@ -581,10 +591,12 @@ src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ab src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/responses/response200/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/fakepemcontenttype/get/requestbody/content/applicationxpemfile/Schema.java src/main/java/org/openapijsonschematools/client/paths/fakepemcontenttype/get/responses/response200/content/applicationxpemfile/Schema.java +src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/responses/response200/content/applicationjson/Schema.java +src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/parameters/parameter0/content/applicationjson/Schema0.java src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/responses/response200/content/applicationjson/Schema.java @@ -632,28 +644,54 @@ src/main/java/org/openapijsonschematools/client/paths/foo/get/responses/response src/main/java/org/openapijsonschematools/client/paths/foo/get/servers/FooGetServer0.java src/main/java/org/openapijsonschematools/client/paths/foo/get/servers/FooGetServer1.java src/main/java/org/openapijsonschematools/client/paths/foo/get/servers/server1/Variables.java +src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java +src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java +src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java +src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java +src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/PetfindbystatusServerInfo.java +src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java +src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/PetfindbystatusServer0.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/PetfindbystatusServer1.java src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/server1/Variables.java +src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/QueryParameters.java src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/parameters/parameter0/Schema0.java +src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/HeaderParameters.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PathParameters.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/parameters/parameter1/Schema1.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PathParameters.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/responses/response200/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/petpetid/get/responses/response200/content/applicationxml/Schema.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PathParameters.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PathParameters.java +src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.java src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java +src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java +src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java +src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java src/main/java/org/openapijsonschematools/client/paths/storeorder/post/requestbody/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/storeorder/post/responses/response200/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/paths/storeorder/post/responses/response200/content/applicationxml/Schema.java @@ -679,13 +717,13 @@ src/main/java/org/openapijsonschematools/client/paths/userusername/get/responses src/main/java/org/openapijsonschematools/client/paths/userusername/put/PathParameters.java src/main/java/org/openapijsonschematools/client/paths/userusername/put/requestbody/content/applicationjson/Schema.java src/main/java/org/openapijsonschematools/client/schemas/AnyTypeJsonSchema.java -src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java src/main/java/org/openapijsonschematools/client/schemas/BooleanJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DateJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DateTimeJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DecimalJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java +src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java src/main/java/org/openapijsonschematools/client/schemas/Int32JsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/Int64JsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/IntJsonSchema.java @@ -773,8 +811,12 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/UniqueItemsVa src/main/java/org/openapijsonschematools/client/schemas/validation/UnsetAnyTypeJsonSchema.java src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationData.java src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationMetadata.java -src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyInLocation.java -src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeySecurityScheme.java +src/main/java/org/openapijsonschematools/client/securityrequirementobjects/EmptySecurityRequirementObject.java +src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java +src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObjectProvider.java +src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyCookieSecurityScheme.java +src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyHeaderSecurityScheme.java +src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyQuerySecurityScheme.java src/main/java/org/openapijsonschematools/client/securityschemes/HttpBasicSecurityScheme.java src/main/java/org/openapijsonschematools/client/securityschemes/HttpBearerSecurityScheme.java src/main/java/org/openapijsonschematools/client/securityschemes/HttpDigestSecurityScheme.java diff --git a/samples/client/petstore/java/docs/components/securityschemes/ApiKey.md b/samples/client/petstore/java/docs/components/securityschemes/ApiKey.md index 538c889758d..683fc84f1f0 100644 --- a/samples/client/petstore/java/docs/components/securityschemes/ApiKey.md +++ b/samples/client/petstore/java/docs/components/securityschemes/ApiKey.md @@ -1,8 +1,8 @@ org.openapijsonschematools.client.components.securityschemes.ApiKey # SecurityScheme ApiKey -public class ApiKey -extends ApiKeySecurityScheme +public class ApiKey +extends ApiKeyHeaderSecurityScheme A class that is used to apply auth to a request diff --git a/samples/client/petstore/java/docs/components/securityschemes/ApiKeyQuery.md b/samples/client/petstore/java/docs/components/securityschemes/ApiKeyQuery.md index 84abfb73118..3a9c08397fa 100644 --- a/samples/client/petstore/java/docs/components/securityschemes/ApiKeyQuery.md +++ b/samples/client/petstore/java/docs/components/securityschemes/ApiKeyQuery.md @@ -1,8 +1,8 @@ org.openapijsonschematools.client.components.securityschemes.ApiKeyQuery # SecurityScheme ApiKeyQuery -public class ApiKeyQuery -extends ApiKeySecurityScheme +public class ApiKeyQuery +extends ApiKeyQuerySecurityScheme A class that is used to apply auth to a request diff --git a/samples/client/petstore/java/docs/components/securityschemes/BearerTest.md b/samples/client/petstore/java/docs/components/securityschemes/BearerTest.md index 9ef82278136..fd0b3c2f14b 100644 --- a/samples/client/petstore/java/docs/components/securityschemes/BearerTest.md +++ b/samples/client/petstore/java/docs/components/securityschemes/BearerTest.md @@ -1,7 +1,7 @@ org.openapijsonschematools.client.components.securityschemes.BearerTest # SecurityScheme BearerTest -public class BearerTest +public class BearerTest extends HttpBearerSecurityScheme A class that is used to apply auth to a request diff --git a/samples/client/petstore/java/docs/components/securityschemes/HttpBasicTest.md b/samples/client/petstore/java/docs/components/securityschemes/HttpBasicTest.md index 7e269daf174..d828c6a7db1 100644 --- a/samples/client/petstore/java/docs/components/securityschemes/HttpBasicTest.md +++ b/samples/client/petstore/java/docs/components/securityschemes/HttpBasicTest.md @@ -1,7 +1,7 @@ org.openapijsonschematools.client.components.securityschemes.HttpBasicTest # SecurityScheme HttpBasicTest -public class HttpBasicTest +public class HttpBasicTest extends HttpBasicSecurityScheme A class that is used to apply auth to a request diff --git a/samples/client/petstore/java/docs/components/securityschemes/HttpSignatureTest.md b/samples/client/petstore/java/docs/components/securityschemes/HttpSignatureTest.md index 3cb84ab41be..1c3a9df3af0 100644 --- a/samples/client/petstore/java/docs/components/securityschemes/HttpSignatureTest.md +++ b/samples/client/petstore/java/docs/components/securityschemes/HttpSignatureTest.md @@ -1,7 +1,7 @@ org.openapijsonschematools.client.components.securityschemes.HttpSignatureTest # SecurityScheme HttpSignatureTest -public class HttpSignatureTest +public class HttpSignatureTest extends HttpSignatureSecurityScheme A class that is used to apply auth to a request diff --git a/samples/client/petstore/java/docs/components/securityschemes/OpenIdConnectTest.md b/samples/client/petstore/java/docs/components/securityschemes/OpenIdConnectTest.md index 4221999cfc5..c53a8c6d6df 100644 --- a/samples/client/petstore/java/docs/components/securityschemes/OpenIdConnectTest.md +++ b/samples/client/petstore/java/docs/components/securityschemes/OpenIdConnectTest.md @@ -1,7 +1,7 @@ org.openapijsonschematools.client.components.securityschemes.OpenIdConnectTest # SecurityScheme OpenIdConnectTest -public class OpenIdConnectTest +public class OpenIdConnectTest extends OpenIdConnectSecurityScheme A class that is used to apply auth to a request diff --git a/samples/client/petstore/java/docs/components/securityschemes/PetstoreAuth.md b/samples/client/petstore/java/docs/components/securityschemes/PetstoreAuth.md index f50a6617361..1a71f915c39 100644 --- a/samples/client/petstore/java/docs/components/securityschemes/PetstoreAuth.md +++ b/samples/client/petstore/java/docs/components/securityschemes/PetstoreAuth.md @@ -1,7 +1,7 @@ org.openapijsonschematools.client.components.securityschemes.PetstoreAuth # SecurityScheme PetstoreAuth -public class PetstoreAuth +public class PetstoreAuth extends Oauth2SecurityScheme A class that is used to apply auth to a request diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/headerswithnobody/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/headerswithnobody/Headers.java index 10e50ebd5f2..81a556646bc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/headerswithnobody/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/headerswithnobody/Headers.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T location(String value) { } } - public static class HeadersMapBuilder implements BaseBuilder, SetterForLocation { + public static class HeadersMapBuilder implements GenericBuilder>, SetterForLocation { private final Map instance; private static final Set knownKeys = Set.of( "location" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/Headers.java index 3d7508e9167..ebb70adc8ed 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/Headers.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T someHeader(String value) { } } - public static class HeadersMapBuilder implements BaseBuilder, SetterForSomeHeader { + public static class HeadersMapBuilder implements GenericBuilder>, SetterForSomeHeader { private final Map instance; private static final Set knownKeys = Set.of( "someHeader" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java index 52941ee0487..60fc1461f17 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -74,7 +74,7 @@ default T additionalProperty(String key, float value) throws InvalidAdditionalPr } } - public static class SchemaMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class SchemaMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successwithjsonapiresponse/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successwithjsonapiresponse/Headers.java index 96524836d0b..8eb350f3ac0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successwithjsonapiresponse/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/responses/successwithjsonapiresponse/Headers.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -150,7 +150,7 @@ default T numberHeader(String value) { } } - public static class HeadersMap0000Builder implements BaseBuilder<@Nullable Object>, SetterForNumberHeader { + public static class HeadersMap0000Builder implements GenericBuilder>, SetterForNumberHeader { private final Map instance; private static final Set knownKeys = Set.of( "int32", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessage.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessage.java index 0930f69cb22..20bf73f2db3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessage.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessage.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -206,7 +206,7 @@ default T sequenceNumber(Map value) { } } - public static class AbstractStepMessageMap000Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class AbstractStepMessageMap000Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "description", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClass.java index 628638e94c0..bdff5dec7d3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClass.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.MapJsonSchema; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -72,7 +72,7 @@ default T additionalProperty(String key, String value) throws InvalidAdditionalP } } - public static class MapPropertyMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class MapPropertyMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -203,7 +203,7 @@ default T additionalProperty(String key, String value) throws InvalidAdditionalP } } - public static class AdditionalPropertiesMapBuilder2 implements BaseBuilder, SetterForAdditionalProperties2 { + public static class AdditionalPropertiesMapBuilder2 implements GenericBuilder>, SetterForAdditionalProperties2 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -323,7 +323,7 @@ default T additionalProperty(String key, Map value) throws Inval } } - public static class MapOfMapPropertyMapBuilder implements BaseBuilder>, SetterForAdditionalProperties1 { + public static class MapOfMapPropertyMapBuilder implements GenericBuilder>>, SetterForAdditionalProperties1 { private final Map> instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -543,7 +543,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class MapWithUndeclaredPropertiesAnytype3MapBuilder implements BaseBuilder<@Nullable Object>, SetterForAdditionalProperties3 { + public static class MapWithUndeclaredPropertiesAnytype3MapBuilder implements GenericBuilder>, SetterForAdditionalProperties3 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -656,7 +656,7 @@ public static EmptyMapMap of(Map arg, SchemaConfigurat } } - public static class EmptyMapMapBuilder implements BaseBuilder<@Nullable Object> { + public static class EmptyMapMapBuilder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -778,7 +778,7 @@ default T additionalProperty(String key, String value) throws InvalidAdditionalP } } - public static class MapWithUndeclaredPropertiesStringMapBuilder implements BaseBuilder, SetterForAdditionalProperties5 { + public static class MapWithUndeclaredPropertiesStringMapBuilder implements GenericBuilder>, SetterForAdditionalProperties5 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -1106,7 +1106,7 @@ default T map_with_undeclared_properties_string(Map value) { } } - public static class AdditionalPropertiesClassMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForMapProperty, SetterForMapOfMapProperty, SetterForAnytype1, SetterForMapWithUndeclaredPropertiesAnytype1, SetterForMapWithUndeclaredPropertiesAnytype2, SetterForMapWithUndeclaredPropertiesAnytype3, SetterForEmptyMap, SetterForMapWithUndeclaredPropertiesString { + public static class AdditionalPropertiesClassMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForMapProperty, SetterForMapOfMapProperty, SetterForAnytype1, SetterForMapWithUndeclaredPropertiesAnytype1, SetterForMapWithUndeclaredPropertiesAnytype2, SetterForMapWithUndeclaredPropertiesAnytype3, SetterForEmptyMap, SetterForMapWithUndeclaredPropertiesString { private final Map instance; private static final Set knownKeys = Set.of( "map_property", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchema.java index f527c4c8a0d..168359a5bdb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchema.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -133,7 +133,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class Schema0MapBuilder implements BaseBuilder<@Nullable Object>, SetterForAdditionalProperties { + public static class Schema0MapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -501,7 +501,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class Schema1MapBuilder implements BaseBuilder<@Nullable Object>, SetterForAdditionalProperties1 { + public static class Schema1MapBuilder implements GenericBuilder>, SetterForAdditionalProperties1 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -869,7 +869,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class Schema2MapBuilder implements BaseBuilder<@Nullable Object>, SetterForAdditionalProperties2 { + public static class Schema2MapBuilder implements GenericBuilder>, SetterForAdditionalProperties2 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnums.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnums.java index c275e49e539..fe6c550ef5a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnums.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnums.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenList; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -164,7 +164,7 @@ default T additionalProperty(String key, List value) throws InvalidAddit } } - public static class AdditionalPropertiesWithArrayOfEnumsMapBuilder implements BaseBuilder>, SetterForAdditionalProperties { + public static class AdditionalPropertiesWithArrayOfEnumsMapBuilder implements GenericBuilder>>, SetterForAdditionalProperties { private final Map> instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Address.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Address.java index 715a77ca510..854e2db5190 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Address.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Address.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -88,7 +88,7 @@ default T additionalProperty(String key, double value) throws InvalidAdditionalP } } - public static class AddressMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class AddressMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Animal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Animal.java index edd82147a44..8221a4fc4a9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Animal.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Animal.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -155,7 +155,7 @@ default T color(String value) { } } - public static class AnimalMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForColor { + public static class AnimalMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForColor { private final Map instance; private static final Set knownKeys = Set.of( "className", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormat.java index fb8ab96168c..5c99251faab 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormat.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormat.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -2366,7 +2366,7 @@ default T setFloat(Map value) { } } - public static class AnyTypeAndFormatMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForUuidSchema, SetterForDate, SetterForDatetime, SetterForNumberSchema, SetterForBinary, SetterForInt32, SetterForInt64, SetterForDoubleSchema, SetterForFloatSchema { + public static class AnyTypeAndFormatMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForUuidSchema, SetterForDate, SetterForDatetime, SetterForNumberSchema, SetterForBinary, SetterForInt32, SetterForInt64, SetterForDoubleSchema, SetterForFloatSchema { private final Map instance; private static final Set knownKeys = Set.of( "uuid", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchema.java index 6bf7641cf69..e640de16795 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -153,7 +153,7 @@ default T message(String value) { } } - public static class ApiResponseMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForCode, SetterForType, SetterForMessage { + public static class ApiResponseMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForCode, SetterForType, SetterForMessage { private final Map instance; private static final Set knownKeys = Set.of( "code", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Apple.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Apple.java index 7cbb2c79504..503197568db 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Apple.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Apple.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -189,7 +189,7 @@ default T origin(String value) { } } - public static class AppleMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForOrigin { + public static class AppleMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForOrigin { private final Map instance; private static final Set knownKeys = Set.of( "cultivar", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AppleReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AppleReq.java index 88bcf8c9967..e0702e2ac4d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AppleReq.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/AppleReq.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -120,7 +120,7 @@ default T mealy(boolean value) { } } - public static class AppleReqMap0Builder implements BaseBuilder, SetterForMealy { + public static class AppleReqMap0Builder implements GenericBuilder>, SetterForMealy { private final Map instance; private static final Set knownKeys = Set.of( "cultivar", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnly.java index 803806d7c8c..eaef8350412 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnly.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -293,7 +293,7 @@ default T ArrayArrayNumber(List> value) { } } - public static class ArrayOfArrayOfNumberOnlyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForArrayArrayNumber { + public static class ArrayOfArrayOfNumberOnlyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForArrayArrayNumber { private final Map instance; private static final Set knownKeys = Set.of( "ArrayArrayNumber" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnly.java index ce4fa18c999..94fa2c6e5fa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnly.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -195,7 +195,7 @@ default T ArrayNumber(List value) { } } - public static class ArrayOfNumberOnlyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForArrayNumber { + public static class ArrayOfNumberOnlyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForArrayNumber { private final Map instance; private static final Set knownKeys = Set.of( "ArrayNumber" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayTest.java index 00d02131b14..ef5c91ccea5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ArrayTest.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -643,7 +643,7 @@ default T array_array_of_model(List>> value) } } - public static class ArrayTestMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForArrayOfString, SetterForArrayArrayOfInteger, SetterForArrayArrayOfModel { + public static class ArrayTestMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForArrayOfString, SetterForArrayArrayOfInteger, SetterForArrayArrayOfModel { private final Map instance; private static final Set knownKeys = Set.of( "array_of_string", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Banana.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Banana.java index 477213e692a..a63bc779dcd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Banana.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Banana.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -96,7 +96,7 @@ default T lengthCm(double value) { } } - public static class BananaMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class BananaMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "lengthCm" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BananaReq.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BananaReq.java index 2553abfec3e..4b41bb9cc54 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BananaReq.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BananaReq.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -138,7 +138,7 @@ default T sweet(boolean value) { } } - public static class BananaReqMap0Builder implements BaseBuilder, SetterForSweet { + public static class BananaReqMap0Builder implements GenericBuilder>, SetterForSweet { private final Map instance; private static final Set knownKeys = Set.of( "lengthCm", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BasquePig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BasquePig.java index 50d2587bc3b..8accde526aa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BasquePig.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/BasquePig.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -141,7 +141,7 @@ default T className(StringClassNameEnums value) { } } - public static class BasquePigMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class BasquePigMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "className" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Capitalization.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Capitalization.java index 2d3e5b24d22..f7a3620dd35 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Capitalization.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Capitalization.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -245,7 +245,7 @@ default T ATT_NAME(String value) { } } - public static class CapitalizationMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSmallCamel, SetterForCapitalCamel, SetterForSmallSnake, SetterForCapitalSnake, SetterForSCAETHFlowPoints, SetterForATTNAME { + public static class CapitalizationMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSmallCamel, SetterForCapitalCamel, SetterForSmallSnake, SetterForCapitalSnake, SetterForSCAETHFlowPoints, SetterForATTNAME { private final Map instance; private static final Set knownKeys = Set.of( "smallCamel", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Cat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Cat.java index 80ced2a681f..7c2160c4f96 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Cat.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Cat.java @@ -17,8 +17,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -89,7 +89,7 @@ default T declawed(boolean value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForDeclawed { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForDeclawed { private final Map instance; private static final Set knownKeys = Set.of( "declawed" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Category.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Category.java index 3f441618736..c0fe36dc1d9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Category.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Category.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -173,7 +173,7 @@ default T id(double value) { } } - public static class CategoryMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForId { + public static class CategoryMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForId { private final Map instance; private static final Set knownKeys = Set.of( "name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ChildCat.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ChildCat.java index 19d5abff664..f0b91f518a5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ChildCat.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ChildCat.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -89,7 +89,7 @@ default T name(String value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForName { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForName { private final Map instance; private static final Set knownKeys = Set.of( "name" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java index 918d5135bb4..fd5c29e6cb3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -79,7 +79,7 @@ default T setClass(String value) { } } - public static class ClassModelMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForClassSchema { + public static class ClassModelMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForClassSchema { private final Map instance; private static final Set knownKeys = Set.of( "_class" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Client.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Client.java index 158c404190e..145a4b8aa81 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Client.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Client.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T client(String value) { } } - public static class ClientMapBuilder1 extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForClient2 { + public static class ClientMapBuilder1 extends UnsetAddPropsSetter implements GenericBuilder>, SetterForClient2 { private final Map instance; private static final Set knownKeys = Set.of( "client" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateral.java index 1025ce97679..5fe61cfb746 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateral.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateral.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -151,7 +151,7 @@ default T quadrilateralType(StringQuadrilateralTypeEnums value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForQuadrilateralType { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForQuadrilateralType { private final Map instance; private static final Set knownKeys = Set.of( "quadrilateralType" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/DanishPig.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/DanishPig.java index ec24202a947..3a52d786975 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/DanishPig.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/DanishPig.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -141,7 +141,7 @@ default T className(StringClassNameEnums value) { } } - public static class DanishPigMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class DanishPigMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "className" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Dog.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Dog.java index 610d7c85f75..03d5b110b2c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Dog.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Dog.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -89,7 +89,7 @@ default T breed(String value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForBreed { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForBreed { private final Map instance; private static final Set knownKeys = Set.of( "breed" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Drawing.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Drawing.java index 0ff59001f26..85b7eb0bb83 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Drawing.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Drawing.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenList; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -490,7 +490,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class DrawingMapBuilder implements BaseBuilder<@Nullable Object>, SetterForMainShape, SetterForShapeOrNull, SetterForNullableShape, SetterForShapes, SetterForAdditionalProperties { + public static class DrawingMapBuilder implements GenericBuilder>, SetterForMainShape, SetterForShapeOrNull, SetterForNullableShape, SetterForShapes, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "mainShape", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumArrays.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumArrays.java index 5b12713e22e..6461c8f44ee 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumArrays.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumArrays.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -339,7 +339,7 @@ default T array_enum(List value) { } } - public static class EnumArraysMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForJustSymbol, SetterForArrayEnum { + public static class EnumArraysMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForJustSymbol, SetterForArrayEnum { private final Map instance; private static final Set knownKeys = Set.of( "just_symbol", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumTest.java index 62471ea6793..2231e1b4c67 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumTest.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.DoubleEnumValidator; @@ -842,7 +842,7 @@ default T IntegerEnumOneValue(IntegerEnumOneValue.DoubleIntegerEnumOneValueEnums } } - public static class EnumTestMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForEnumString, SetterForEnumInteger, SetterForEnumNumber, SetterForStringEnum, SetterForIntegerEnum, SetterForStringEnumWithDefaultValue, SetterForIntegerEnumWithDefaultValue, SetterForIntegerEnumOneValue { + public static class EnumTestMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForEnumString, SetterForEnumInteger, SetterForEnumNumber, SetterForStringEnum, SetterForIntegerEnum, SetterForStringEnumWithDefaultValue, SetterForIntegerEnumWithDefaultValue, SetterForIntegerEnumOneValue { private final Map instance; private static final Set knownKeys = Set.of( "enum_string_required", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangle.java index d69858c4fe1..7c3e9c022aa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangle.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangle.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -151,7 +151,7 @@ default T triangleType(StringTriangleTypeEnums value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForTriangleType { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForTriangleType { private final Map instance; private static final Set knownKeys = Set.of( "triangleType" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/File.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/File.java index 59c25cb7c23..4e52bf603dd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/File.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/File.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T sourceURI(String value) { } } - public static class FileMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSourceURI { + public static class FileMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSourceURI { private final Map instance; private static final Set knownKeys = Set.of( "sourceURI" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClass.java index b625220b2e0..46357aedb58 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClass.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenList; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -190,7 +190,7 @@ default T files(List> value) { } } - public static class FileSchemaTestClassMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFile, SetterForFiles { + public static class FileSchemaTestClassMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFile, SetterForFiles { private final Map instance; private static final Set knownKeys = Set.of( "file", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Foo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Foo.java index ae46d442628..c6a58479f0f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Foo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Foo.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -68,7 +68,7 @@ default T bar(String value) { } } - public static class FooMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForBar { + public static class FooMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForBar { private final Map instance; private static final Set knownKeys = Set.of( "bar" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FormatTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FormatTest.java index d9eb96d5b6c..65391883252 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FormatTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FormatTest.java @@ -16,11 +16,11 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.DateJsonSchema; import org.openapijsonschematools.client.schemas.DateTimeJsonSchema; import org.openapijsonschematools.client.schemas.DoubleJsonSchema; import org.openapijsonschematools.client.schemas.FloatJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.NullJsonSchema; @@ -1332,7 +1332,7 @@ default T noneProp(Void value) { } } - public static class FormatTestMap0000Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForIntegerSchema, SetterForInt32, SetterForInt32withValidations, SetterForInt64, SetterForFloatSchema, SetterForFloat32, SetterForDoubleSchema, SetterForFloat64, SetterForArrayWithUniqueItems, SetterForStringSchema, SetterForBinary, SetterForDateTime, SetterForUuidSchema, SetterForUuidNoExample, SetterForPatternWithDigits, SetterForPatternWithDigitsAndDelimiter, SetterForNoneProp { + public static class FormatTestMap0000Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForIntegerSchema, SetterForInt32, SetterForInt32withValidations, SetterForInt64, SetterForFloatSchema, SetterForFloat32, SetterForDoubleSchema, SetterForFloat64, SetterForArrayWithUniqueItems, SetterForStringSchema, SetterForBinary, SetterForDateTime, SetterForUuidSchema, SetterForUuidNoExample, SetterForPatternWithDigits, SetterForPatternWithDigitsAndDelimiter, SetterForNoneProp { private final Map instance; private static final Set knownKeys = Set.of( "byte", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FromSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FromSchema.java index 8ecac138dde..ba1a0421b15 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FromSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/FromSchema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -132,7 +132,7 @@ default T id(double value) { } } - public static class FromSchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForData, SetterForId { + public static class FromSchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForData, SetterForId { private final Map instance; private static final Set knownKeys = Set.of( "data", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Fruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Fruit.java index 21b4409c0dd..5789c947c25 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Fruit.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Fruit.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -89,7 +89,7 @@ default T color(String value) { } } - public static class FruitMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForColor { + public static class FruitMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForColor { private final Map instance; private static final Set knownKeys = Set.of( "color" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GmFruit.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GmFruit.java index 32efafee422..fab117a14f7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GmFruit.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GmFruit.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -89,7 +89,7 @@ default T color(String value) { } } - public static class GmFruitMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForColor { + public static class GmFruitMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForColor { private final Map instance; private static final Set knownKeys = Set.of( "color" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimal.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimal.java index 665ecbf8777..9ebd8b4e373 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimal.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimal.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -78,7 +78,7 @@ default T pet_type(String value) { } } - public static class GrandparentAnimalMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class GrandparentAnimalMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "pet_type" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnly.java index b50f3c67e6c..f100fea73a3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnly.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -113,7 +113,7 @@ default T foo(String value) { } } - public static class HasOnlyReadOnlyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForBar, SetterForFoo { + public static class HasOnlyReadOnlyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForBar, SetterForFoo { private final Map instance; private static final Set knownKeys = Set.of( "bar", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HealthCheckResult.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HealthCheckResult.java index bef1b94ae63..770f7ff191e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HealthCheckResult.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/HealthCheckResult.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -137,7 +137,7 @@ default T NullableMessage(String value) { } } - public static class HealthCheckResultMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForNullableMessage { + public static class HealthCheckResultMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForNullableMessage { private final Map instance; private static final Set knownKeys = Set.of( "NullableMessage" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangle.java index 9821aa359cf..559c9fc6acb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangle.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangle.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -151,7 +151,7 @@ default T triangleType(StringTriangleTypeEnums value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForTriangleType { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForTriangleType { private final Map instance; private static final Set knownKeys = Set.of( "triangleType" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTest.java index cfd28907766..529683faaa0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTest.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -259,7 +259,7 @@ default T value(Map value) { } } - public static class JSONPatchRequestAddReplaceTestMap000Builder implements BaseBuilder<@Nullable Object> { + public static class JSONPatchRequestAddReplaceTestMap000Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "op", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopy.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopy.java index 79cc95e6b7f..b62586052c2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopy.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopy.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -205,7 +205,7 @@ default T path(String value) { } } - public static class JSONPatchRequestMoveCopyMap000Builder implements BaseBuilder { + public static class JSONPatchRequestMoveCopyMap000Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "from", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemove.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemove.java index 29250030627..d1a10ee0983 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemove.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemove.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -176,7 +176,7 @@ default T path(String value) { } } - public static class JSONPatchRequestRemoveMap00Builder implements BaseBuilder { + public static class JSONPatchRequestRemoveMap00Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "op", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MapTest.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MapTest.java index 55de72d9268..b0746a8360f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MapTest.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MapTest.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -74,7 +74,7 @@ default T additionalProperty(String key, String value) throws InvalidAdditionalP } } - public static class AdditionalPropertiesMapBuilder1 implements BaseBuilder, SetterForAdditionalProperties1 { + public static class AdditionalPropertiesMapBuilder1 implements GenericBuilder>, SetterForAdditionalProperties1 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -194,7 +194,7 @@ default T additionalProperty(String key, Map value) throws Inval } } - public static class MapMapOfStringMapBuilder implements BaseBuilder>, SetterForAdditionalProperties { + public static class MapMapOfStringMapBuilder implements GenericBuilder>>, SetterForAdditionalProperties { private final Map> instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -388,7 +388,7 @@ default T additionalProperty(String key, StringAdditionalPropertiesEnums value) } } - public static class MapOfEnumStringMapBuilder implements BaseBuilder, SetterForAdditionalProperties2 { + public static class MapOfEnumStringMapBuilder implements GenericBuilder>, SetterForAdditionalProperties2 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -524,7 +524,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class DirectMapMapBuilder implements BaseBuilder, SetterForAdditionalProperties3 { + public static class DirectMapMapBuilder implements GenericBuilder>, SetterForAdditionalProperties3 { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -722,7 +722,7 @@ default T indirect_map(Map value) { } } - public static class MapTestMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForMapMapOfString, SetterForMapOfEnumString, SetterForDirectMap, SetterForIndirectMap { + public static class MapTestMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForMapMapOfString, SetterForMapOfEnumString, SetterForDirectMap, SetterForIndirectMap { private final Map instance; private static final Set knownKeys = Set.of( "map_map_of_string", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java index 8f298149ebd..3e47f13feec 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClass.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.DateTimeJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.UuidJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -81,7 +81,7 @@ default T additionalProperty(String key, Map value) th } } - public static class MapMapBuilder implements BaseBuilder>, SetterForAdditionalProperties { + public static class MapMapBuilder implements GenericBuilder>>, SetterForAdditionalProperties { private final Map> instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -237,7 +237,7 @@ default T setMap(Map> value) { } } - public static class MixedPropertiesAndAdditionalPropertiesClassMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForUuidSchema, SetterForDateTime, SetterForMapSchema { + public static class MixedPropertiesAndAdditionalPropertiesClassMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForUuidSchema, SetterForDateTime, SetterForMapSchema { private final Map instance; private static final Set knownKeys = Set.of( "uuid", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Money.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Money.java index 826ae30865c..64bcf4c5500 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Money.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Money.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.DecimalJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -111,7 +111,7 @@ default T currency(Currency.StringCurrencyEnums value) { } } - public static class MoneyMap00Builder implements BaseBuilder<@Nullable Object> { + public static class MoneyMap00Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "amount", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MyObjectDto.java index 8327f04bf4b..5bf6d1c1c09 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MyObjectDto.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/MyObjectDto.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.UuidJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -81,7 +81,7 @@ default T id(String value) { } } - public static class MyObjectDtoMapBuilder implements BaseBuilder, SetterForId { + public static class MyObjectDtoMapBuilder implements GenericBuilder>, SetterForId { private final Map instance; private static final Set knownKeys = Set.of( "id" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Name.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Name.java index 3a4865e50a4..96200d854b5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Name.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Name.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -167,7 +167,7 @@ default T property(String value) { } } - public static class NameMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSnakeCase, SetterForProperty { + public static class NameMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSnakeCase, SetterForProperty { private final Map instance; private static final Set knownKeys = Set.of( "name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NoAdditionalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NoAdditionalProperties.java index 33b16bfc96c..39f810307aa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NoAdditionalProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NoAdditionalProperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -145,7 +145,7 @@ default T petId(double value) { } } - public static class NoAdditionalPropertiesMap0Builder implements BaseBuilder, SetterForPetId { + public static class NoAdditionalPropertiesMap0Builder implements GenericBuilder>, SetterForPetId { private final Map instance; private static final Set knownKeys = Set.of( "id", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NullableClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NullableClass.java index fc9031f3a47..3dd142fba83 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NullableClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NullableClass.java @@ -16,7 +16,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.MapJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -1089,7 +1089,7 @@ default T additionalProperty(String key, Map value) th } } - public static class ObjectNullablePropMapBuilder implements BaseBuilder>, SetterForAdditionalProperties { + public static class ObjectNullablePropMapBuilder implements GenericBuilder>>, SetterForAdditionalProperties { private final Map> instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -1317,7 +1317,7 @@ default T additionalProperty(String key, Map value) th } } - public static class ObjectAndItemsNullablePropMapBuilder implements BaseBuilder<@Nullable Map>, SetterForAdditionalProperties1 { + public static class ObjectAndItemsNullablePropMapBuilder implements GenericBuilder>>, SetterForAdditionalProperties1 { private final Map> instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -1545,7 +1545,7 @@ default T additionalProperty(String key, Map value) th } } - public static class ObjectItemsNullableMapBuilder implements BaseBuilder<@Nullable Map>, SetterForAdditionalProperties2 { + public static class ObjectItemsNullableMapBuilder implements GenericBuilder>>, SetterForAdditionalProperties2 { private final Map> instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { @@ -2038,7 +2038,7 @@ default T additionalProperty(String key, Map value) th } } - public static class NullableClassMapBuilder implements BaseBuilder<@Nullable Object>, SetterForIntegerProp, SetterForNumberProp, SetterForBooleanProp, SetterForStringProp, SetterForDateProp, SetterForDatetimeProp, SetterForArrayNullableProp, SetterForArrayAndItemsNullableProp, SetterForArrayItemsNullable, SetterForObjectNullableProp, SetterForObjectAndItemsNullableProp, SetterForObjectItemsNullable, SetterForAdditionalProperties3 { + public static class NullableClassMapBuilder implements GenericBuilder>, SetterForIntegerProp, SetterForNumberProp, SetterForBooleanProp, SetterForStringProp, SetterForDateProp, SetterForDatetimeProp, SetterForArrayNullableProp, SetterForArrayAndItemsNullableProp, SetterForArrayItemsNullable, SetterForObjectNullableProp, SetterForObjectAndItemsNullableProp, SetterForObjectItemsNullable, SetterForAdditionalProperties3 { private final Map instance; private static final Set knownKeys = Set.of( "integer_prop", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NumberOnly.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NumberOnly.java index f072eecd522..fafa461fcd7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NumberOnly.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/NumberOnly.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -98,7 +98,7 @@ default T JustNumber(double value) { } } - public static class NumberOnlyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForJustNumber { + public static class NumberOnlyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForJustNumber { private final Map instance; private static final Set knownKeys = Set.of( "JustNumber" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredProps.java index 2254951ca49..eeabdc9457b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredProps.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -78,7 +78,7 @@ default T a(String value) { } } - public static class ObjWithRequiredPropsMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class ObjWithRequiredPropsMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "a" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBase.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBase.java index dfac31d2734..1f88f8fa1d5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBase.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBase.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -78,7 +78,7 @@ default T b(String value) { } } - public static class ObjWithRequiredPropsBaseMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class ObjWithRequiredPropsBaseMap0Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "b" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsProperties.java index 2ff1343f60e..5e8daa2186d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsProperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -109,7 +109,7 @@ default T args(String value) { } } - public static class ObjectModelWithArgAndArgsPropertiesMap00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class ObjectModelWithArgAndArgsPropertiesMap00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "arg", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefProps.java index dcc6ece3b73..3b327639c84 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefProps.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -130,7 +130,7 @@ default T myBoolean(boolean value) { } } - public static class ObjectModelWithRefPropsMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForMyNumber, SetterForMyString, SetterForMyBoolean { + public static class ObjectModelWithRefPropsMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForMyNumber, SetterForMyString, SetterForMyBoolean { private final Map instance; private static final Set knownKeys = Set.of( "myNumber", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java index f358c49bf00..41d26de89e6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddProp.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -154,7 +154,7 @@ default T name(String value) { } } - public static class Schema1Map0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForName { + public static class Schema1Map0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForName { private final Map instance; private static final Set knownKeys = Set.of( "test", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingProperties.java index e89b0e726b1..8ffb72e3336 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingProperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.MapJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -113,7 +113,7 @@ default T someprop(Map value) { } } - public static class ObjectWithCollidingPropertiesMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSomeProp, SetterForSomeprop { + public static class ObjectWithCollidingPropertiesMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSomeProp, SetterForSomeprop { private final Map instance; private static final Set knownKeys = Set.of( "someProp", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalProperties.java index 28f5f76285e..56ff7f24f64 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalProperties.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.DecimalJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -124,7 +124,7 @@ default T cost(Map value) { } } - public static class ObjectWithDecimalPropertiesMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForLength, SetterForWidth, SetterForCost { + public static class ObjectWithDecimalPropertiesMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForLength, SetterForWidth, SetterForCost { private final Map instance; private static final Set knownKeys = Set.of( "length", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java index bcab3d14464..93192649bcf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -155,7 +155,7 @@ default T set123number(double value) { } } - public static class ObjectWithDifficultlyNamedPropsMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSpecialpropertyname, SetterForSchema123Number { + public static class ObjectWithDifficultlyNamedPropsMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSpecialpropertyname, SetterForSchema123Number { private final Map instance; private static final Set knownKeys = Set.of( "123-list", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionProperty.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionProperty.java index b9638a2c7cf..474f4f17cec 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionProperty.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionProperty.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -362,7 +362,7 @@ default T someProp(Map value) { } } - public static class ObjectWithInlineCompositionPropertyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSomeProp { + public static class ObjectWithInlineCompositionPropertyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSomeProp { private final Map instance; private static final Set knownKeys = Set.of( "someProp" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedProperties.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedProperties.java index fe90f147000..4427eeb470e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedProperties.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedProperties.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -78,7 +78,7 @@ default T from(Map value) { } } - public static class ObjectWithInvalidNamedRefedPropertiesMap00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class ObjectWithInvalidNamedRefedPropertiesMap00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "!reference", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValues.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValues.java index 1c5c33b1cdc..f4e263bfbc4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValues.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValues.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -126,7 +126,7 @@ default T additionalProperty(String key, String value) throws InvalidAdditionalP } } - public static class ObjectWithNonIntersectingValuesMapBuilder implements BaseBuilder, SetterForA, SetterForAdditionalProperties { + public static class ObjectWithNonIntersectingValuesMapBuilder implements GenericBuilder>, SetterForA, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "a" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalProps.java index 783c9c50cb1..bfaed8ec1c9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalProps.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.NumberJsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -139,7 +139,7 @@ default T b(double value) { } } - public static class ObjectWithOnlyOptionalPropsMapBuilder implements BaseBuilder, SetterForA, SetterForB { + public static class ObjectWithOnlyOptionalPropsMapBuilder implements GenericBuilder>, SetterForA, SetterForB { private final Map instance; private static final Set knownKeys = Set.of( "a", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestProp.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestProp.java index fe552f35fd4..ded31accc35 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestProp.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestProp.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T test(String value) { } } - public static class ObjectWithOptionalTestPropMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForTest { + public static class ObjectWithOptionalTestPropMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForTest { private final Map instance; private static final Set knownKeys = Set.of( "test" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Order.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Order.java index 39f81e21947..d86924c831a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Order.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Order.java @@ -14,9 +14,9 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; import org.openapijsonschematools.client.schemas.DateTimeJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; @@ -358,7 +358,7 @@ default T complete(boolean value) { } } - public static class OrderMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForId, SetterForPetId, SetterForQuantity, SetterForShipDate, SetterForStatus, SetterForComplete { + public static class OrderMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForId, SetterForPetId, SetterForQuantity, SetterForShipDate, SetterForStatus, SetterForComplete { private final Map instance; private static final Set knownKeys = Set.of( "id", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDto.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDto.java index 170e51bd663..7925f4dea1d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDto.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDto.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.IntJsonSchema; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -223,7 +223,7 @@ default T results(List> value) { } } - public static class PaginatedResultMyObjectDtoMap00Builder implements BaseBuilder { + public static class PaginatedResultMyObjectDtoMap00Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "count", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Pet.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Pet.java index 9509878b986..fc4cb4c8cb7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Pet.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Pet.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.StringJsonSchema; @@ -505,7 +505,7 @@ default T status(StringStatusEnums value) { } } - public static class PetMap00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForId, SetterForCategory, SetterForTags, SetterForStatus { + public static class PetMap00Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForId, SetterForCategory, SetterForTags, SetterForStatus { private final Map instance; private static final Set knownKeys = Set.of( "name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Player.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Player.java index 9da24c3ec70..f3523c1f566 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Player.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Player.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -102,7 +102,7 @@ default T enemyPlayer(Map value) { } } - public static class PlayerMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForName, SetterForEnemyPlayer { + public static class PlayerMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForName, SetterForEnemyPlayer { private final Map instance; private static final Set knownKeys = Set.of( "name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PublicKey.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PublicKey.java index b277f5f7066..956b20dbd0e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PublicKey.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/PublicKey.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T key(String value) { } } - public static class PublicKeyMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForKey { + public static class PublicKeyMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForKey { private final Map instance; private static final Set knownKeys = Set.of( "key" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterface.java index b9cda6f4385..28b5bd0473c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterface.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterface.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -181,7 +181,7 @@ default T shapeType(StringShapeTypeEnums value) { } } - public static class QuadrilateralInterfaceMap00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class QuadrilateralInterfaceMap00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "quadrilateralType", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirst.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirst.java index d3d96143ed1..dc97ea7296a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirst.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirst.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -113,7 +113,7 @@ default T baz(String value) { } } - public static class ReadOnlyFirstMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForBar, SetterForBaz { + public static class ReadOnlyFirstMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForBar, SetterForBaz { private final Map instance; private static final Set knownKeys = Set.of( "bar", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddProps.java index 26878ee2841..88f4c7b869c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddProps.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -97,7 +97,7 @@ default T additionalProperty(String key, String value) throws InvalidAdditionalP } } - public static class ReqPropsFromExplicitAddPropsMap00Builder implements BaseBuilder, SetterForAdditionalProperties { + public static class ReqPropsFromExplicitAddPropsMap00Builder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "invalid-name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddProps.java index 1bf330e8320..cd09a7882d3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddProps.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -249,7 +249,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class ReqPropsFromTrueAddPropsMap00Builder implements BaseBuilder<@Nullable Object>, SetterForAdditionalProperties { + public static class ReqPropsFromTrueAddPropsMap00Builder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "invalid-name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddProps.java index fc151104c23..692703a3a80 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddProps.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -169,7 +169,7 @@ default T validName(Map value) { } } - public static class ReqPropsFromUnsetAddPropsMap00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class ReqPropsFromUnsetAddPropsMap00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "invalid-name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReturnSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReturnSchema.java index 63e4fd68a77..6b5fb22ddb9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReturnSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ReturnSchema.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -85,7 +85,7 @@ default T setReturn(float value) { } } - public static class ReturnMapBuilder1 extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForReturnSchema2 { + public static class ReturnMapBuilder1 extends UnsetAddPropsSetter implements GenericBuilder>, SetterForReturnSchema2 { private final Map instance; private static final Set knownKeys = Set.of( "return" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangle.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangle.java index 3c4793c7a53..2a5883826bc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangle.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangle.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -151,7 +151,7 @@ default T triangleType(StringTriangleTypeEnums value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForTriangleType { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForTriangleType { private final Map instance; private static final Set knownKeys = Set.of( "triangleType" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Schema200Response.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Schema200Response.java index b884f57c7df..4d827edba10 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Schema200Response.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Schema200Response.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -119,7 +119,7 @@ default T setClass(String value) { } } - public static class Schema200ResponseMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForName, SetterForClassSchema { + public static class Schema200ResponseMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForName, SetterForClassSchema { private final Map instance; private static final Set knownKeys = Set.of( "name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModel.java index 832d076aace..92009478eec 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModel.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModel.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -84,7 +84,7 @@ default T additionalProperty(String key, Map value) th } } - public static class SelfReferencingObjectModelMapBuilder implements BaseBuilder<@Nullable Object>, SetterForSelfRef, SetterForAdditionalProperties { + public static class SelfReferencingObjectModelMapBuilder implements GenericBuilder>, SetterForSelfRef, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "selfRef" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateral.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateral.java index e8cb5ec58ce..fde66b0bdb3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateral.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateral.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; @@ -151,7 +151,7 @@ default T quadrilateralType(StringQuadrilateralTypeEnums value) { } } - public static class Schema1MapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForQuadrilateralType { + public static class Schema1MapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForQuadrilateralType { private final Map instance; private static final Set knownKeys = Set.of( "quadrilateralType" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SpecialModelname.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SpecialModelname.java index 3ee11f2c8ce..d9d350f1b0e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SpecialModelname.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/SpecialModelname.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T a(String value) { } } - public static class SpecialModelnameMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForA { + public static class SpecialModelnameMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForA { private final Map instance; private static final Set knownKeys = Set.of( "a" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/StringBooleanMap.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/StringBooleanMap.java index d3db1f9a11e..2cf54cdb794 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/StringBooleanMap.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/StringBooleanMap.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo; @@ -72,7 +72,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional } } - public static class StringBooleanMapMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class StringBooleanMapMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Tag.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Tag.java index 0519988c909..be68d19c803 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Tag.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Tag.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -132,7 +132,7 @@ default T name(String value) { } } - public static class TagMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForId, SetterForName { + public static class TagMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForId, SetterForName { private final Map instance; private static final Set knownKeys = Set.of( "id", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/TriangleInterface.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/TriangleInterface.java index a8330366cbc..0e5f932fd74 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/TriangleInterface.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/TriangleInterface.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -181,7 +181,7 @@ default T triangleType(String value) { } } - public static class TriangleInterfaceMap00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class TriangleInterfaceMap00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "shapeType", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/User.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/User.java index bbb2ff55f32..bb6a09e059a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/User.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/User.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int32JsonSchema; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.MapJsonSchema; @@ -914,7 +914,7 @@ default T anyTypePropNullable(Map value) { } } - public static class UserMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForId, SetterForUsername, SetterForFirstName, SetterForLastName, SetterForEmail, SetterForPassword, SetterForPhone, SetterForUserStatus, SetterForObjectWithNoDeclaredProps, SetterForObjectWithNoDeclaredPropsNullable, SetterForAnyTypeProp, SetterForAnyTypeExceptNullProp, SetterForAnyTypePropNullable { + public static class UserMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForId, SetterForUsername, SetterForFirstName, SetterForLastName, SetterForEmail, SetterForPassword, SetterForPhone, SetterForUserStatus, SetterForObjectWithNoDeclaredProps, SetterForObjectWithNoDeclaredPropsNullable, SetterForAnyTypeProp, SetterForAnyTypeExceptNullProp, SetterForAnyTypePropNullable { private final Map instance; private static final Set knownKeys = Set.of( "id", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Whale.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Whale.java index 7953aadbee6..74c98953df4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Whale.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Whale.java @@ -14,8 +14,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.BooleanJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -209,7 +209,7 @@ default T hasTeeth(boolean value) { } } - public static class WhaleMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForHasBaleen, SetterForHasTeeth { + public static class WhaleMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForHasBaleen, SetterForHasTeeth { private final Map instance; private static final Set knownKeys = Set.of( "className", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Zebra.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Zebra.java index 99ca44aa4e8..3ed4f2372c5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Zebra.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/Zebra.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -319,7 +319,7 @@ default T additionalProperty(String key, Map value) throws InvalidAdd } } - public static class ZebraMap0Builder implements BaseBuilder<@Nullable Object>, SetterForType, SetterForAdditionalProperties { + public static class ZebraMap0Builder implements GenericBuilder>, SetterForType, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of( "className", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKey.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKey.java index 510266fdbda..201d3a69593 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKey.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKey.java @@ -1,13 +1,12 @@ package org.openapijsonschematools.client.components.securityschemes; -import org.openapijsonschematools.client.securityschemes.ApiKeySecurityScheme; -import org.openapijsonschematools.client.securityschemes.ApiKeyInLocation; +import org.openapijsonschematools.client.securityschemes.ApiKeyHeaderSecurityScheme; -public class ApiKey extends ApiKeySecurityScheme { +public class ApiKey extends ApiKeyHeaderSecurityScheme { /* apiKey in header */ public ApiKey(String apiKey) { - super(apiKey, "api_key", ApiKeyInLocation.HEADER); + super(apiKey, "api_key"); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKeyQuery.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKeyQuery.java index c75c1f59841..2f33bbf5799 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKeyQuery.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/securityschemes/ApiKeyQuery.java @@ -1,13 +1,12 @@ package org.openapijsonschematools.client.components.securityschemes; -import org.openapijsonschematools.client.securityschemes.ApiKeySecurityScheme; -import org.openapijsonschematools.client.securityschemes.ApiKeyInLocation; +import org.openapijsonschematools.client.securityschemes.ApiKeyQuerySecurityScheme; -public class ApiKeyQuery extends ApiKeySecurityScheme { +public class ApiKeyQuery extends ApiKeyQuerySecurityScheme { /* apiKey in query */ public ApiKeyQuery(String apiKey) { - super(apiKey, "api_key_query", ApiKeyInLocation.QUERY); + super(apiKey, "api_key_query"); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java index d600ad69de9..e766dcb235e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java @@ -1,22 +1,56 @@ package org.openapijsonschematools.client.configurations; +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.servers.Server; import org.openapijsonschematools.client.RootServerInfo; import org.openapijsonschematools.client.paths.foo.get.FooGetServerInfo; import org.openapijsonschematools.client.paths.petfindbystatus.PetfindbystatusServerInfo; +import org.openapijsonschematools.client.paths.fake.delete.FakeDeleteSecurityInfo; +import org.openapijsonschematools.client.paths.fake.post.FakePostSecurityInfo; +import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.FakemultiplesecuritiesGetSecurityInfo; +import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.FakepetiduploadimagewithrequiredfilePostSecurityInfo; +import org.openapijsonschematools.client.paths.fakeclassnametest.patch.FakeclassnametestPatchSecurityInfo; +import org.openapijsonschematools.client.paths.pet.post.PetPostSecurityInfo; +import org.openapijsonschematools.client.paths.pet.put.PetPutSecurityInfo; +import org.openapijsonschematools.client.paths.petfindbystatus.get.PetfindbystatusGetSecurityInfo; +import org.openapijsonschematools.client.paths.petfindbytags.get.PetfindbytagsGetSecurityInfo; +import org.openapijsonschematools.client.paths.petpetid.delete.PetpetidDeleteSecurityInfo; +import org.openapijsonschematools.client.paths.petpetid.get.PetpetidGetSecurityInfo; +import org.openapijsonschematools.client.paths.petpetid.post.PetpetidPostSecurityInfo; +import org.openapijsonschematools.client.paths.petpetiduploadimage.post.PetpetiduploadimagePostSecurityInfo; +import org.openapijsonschematools.client.paths.storeinventory.get.StoreinventoryGetSecurityInfo; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Objects; public class ApiConfiguration { private final ServerInfo serverInfo; + private final SecurityInfo securityInfo; public ApiConfiguration() { serverInfo = new ServerInfo(); + securityInfo = new SecurityInfo( + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null + ); } - public ApiConfiguration(ServerInfo serverInfo) { + public ApiConfiguration(ServerInfo serverInfo, SecurityInfo securityInfo) { this.serverInfo = serverInfo; + this.securityInfo = securityInfo; } public static class ServerInfo { @@ -50,4 +84,152 @@ public Server getServer(FooGetServerInfo. @Nullable ServerIndex serverIndex) { public Server getServer(PetfindbystatusServerInfo. @Nullable ServerIndex serverIndex) { return serverInfo.petfindbystatusServerInfo.getServer(serverIndex); } + + public static class SecurityInfo { + protected final @Nullable FakeDeleteSecurityInfo fakeDeleteSecurityInfo; + protected final @Nullable FakePostSecurityInfo fakePostSecurityInfo; + protected final @Nullable FakemultiplesecuritiesGetSecurityInfo fakemultiplesecuritiesGetSecurityInfo; + protected final @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo fakepetiduploadimagewithrequiredfilePostSecurityInfo; + protected final @Nullable FakeclassnametestPatchSecurityInfo fakeclassnametestPatchSecurityInfo; + protected final @Nullable PetPostSecurityInfo petPostSecurityInfo; + protected final @Nullable PetPutSecurityInfo petPutSecurityInfo; + protected final @Nullable PetfindbystatusGetSecurityInfo petfindbystatusGetSecurityInfo; + protected final @Nullable PetfindbytagsGetSecurityInfo petfindbytagsGetSecurityInfo; + protected final @Nullable PetpetidDeleteSecurityInfo petpetidDeleteSecurityInfo; + protected final @Nullable PetpetidGetSecurityInfo petpetidGetSecurityInfo; + protected final @Nullable PetpetidPostSecurityInfo petpetidPostSecurityInfo; + protected final @Nullable PetpetiduploadimagePostSecurityInfo petpetiduploadimagePostSecurityInfo; + protected final @Nullable StoreinventoryGetSecurityInfo storeinventoryGetSecurityInfo; + + public SecurityInfo( + @Nullable FakeDeleteSecurityInfo fakeDeleteSecurityInfo, + @Nullable FakePostSecurityInfo fakePostSecurityInfo, + @Nullable FakemultiplesecuritiesGetSecurityInfo fakemultiplesecuritiesGetSecurityInfo, + @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo fakepetiduploadimagewithrequiredfilePostSecurityInfo, + @Nullable FakeclassnametestPatchSecurityInfo fakeclassnametestPatchSecurityInfo, + @Nullable PetPostSecurityInfo petPostSecurityInfo, + @Nullable PetPutSecurityInfo petPutSecurityInfo, + @Nullable PetfindbystatusGetSecurityInfo petfindbystatusGetSecurityInfo, + @Nullable PetfindbytagsGetSecurityInfo petfindbytagsGetSecurityInfo, + @Nullable PetpetidDeleteSecurityInfo petpetidDeleteSecurityInfo, + @Nullable PetpetidGetSecurityInfo petpetidGetSecurityInfo, + @Nullable PetpetidPostSecurityInfo petpetidPostSecurityInfo, + @Nullable PetpetiduploadimagePostSecurityInfo petpetiduploadimagePostSecurityInfo, + @Nullable StoreinventoryGetSecurityInfo storeinventoryGetSecurityInfo + ) { + this.fakeDeleteSecurityInfo = fakeDeleteSecurityInfo; + this.fakePostSecurityInfo = fakePostSecurityInfo; + this.fakemultiplesecuritiesGetSecurityInfo = fakemultiplesecuritiesGetSecurityInfo; + this.fakepetiduploadimagewithrequiredfilePostSecurityInfo = fakepetiduploadimagewithrequiredfilePostSecurityInfo; + this.fakeclassnametestPatchSecurityInfo = fakeclassnametestPatchSecurityInfo; + this.petPostSecurityInfo = petPostSecurityInfo; + this.petPutSecurityInfo = petPutSecurityInfo; + this.petfindbystatusGetSecurityInfo = petfindbystatusGetSecurityInfo; + this.petfindbytagsGetSecurityInfo = petfindbytagsGetSecurityInfo; + this.petpetidDeleteSecurityInfo = petpetidDeleteSecurityInfo; + this.petpetidGetSecurityInfo = petpetidGetSecurityInfo; + this.petpetidPostSecurityInfo = petpetidPostSecurityInfo; + this.petpetiduploadimagePostSecurityInfo = petpetiduploadimagePostSecurityInfo; + this.storeinventoryGetSecurityInfo = storeinventoryGetSecurityInfo; + } + } + + public SecurityRequirementObject getSecurityRequirementObject(FakeDeleteSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.fakeDeleteSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakeDeleteSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(FakePostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.fakePostSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakePostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(FakemultiplesecuritiesGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.fakemultiplesecuritiesGetSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakemultiplesecuritiesGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(FakepetiduploadimagewithrequiredfilePostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.fakepetiduploadimagewithrequiredfilePostSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakepetiduploadimagewithrequiredfilePostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(FakeclassnametestPatchSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.fakeclassnametestPatchSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakeclassnametestPatchSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetPostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petPostSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetPostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetPutSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petPutSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetPutSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetfindbystatusGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petfindbystatusGetSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetfindbystatusGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetfindbytagsGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petfindbytagsGetSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetfindbytagsGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetpetidDeleteSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petpetidDeleteSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetidDeleteSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetpetidGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petpetidGetSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetidGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetpetidPostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petpetidPostSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetidPostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(PetpetiduploadimagePostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.petpetiduploadimagePostSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetiduploadimagePostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + public SecurityRequirementObject getSecurityRequirementObject(StoreinventoryGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.storeinventoryGetSecurityInfo; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the StoreinventoryGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/HeaderParameters.java index 199f775753f..d505350c05b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/HeaderParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T someHeader(String value) { } } - public static class HeaderParametersMapBuilder implements BaseBuilder, SetterForSomeHeader { + public static class HeaderParametersMapBuilder implements GenericBuilder>, SetterForSomeHeader { private final Map instance; private static final Set knownKeys = Set.of( "someHeader" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/PathParameters.java index 9e58ec05eea..d67e28aaa58 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.parameter1.Schema1; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -76,7 +76,7 @@ default T subDir(Schema1.StringSchemaEnums1 value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "subDir" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/PathParameters.java index d3cce81dc7b..befd23dd794 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.commonparamsubdir.parameters.parameter0.PathParamSchema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -76,7 +76,7 @@ default T subDir(PathParamSchema0.StringPathParamSchemaEnums0 value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "subDir" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/QueryParameters.java index 7576c026eaa..e9362d61c67 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/QueryParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.commonparamsubdir.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T searchStr(String value) { } } - public static class QueryParametersMapBuilder implements BaseBuilder, SetterForSearchStr { + public static class QueryParametersMapBuilder implements GenericBuilder>, SetterForSearchStr { private final Map instance; private static final Set knownKeys = Set.of( "searchStr" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/HeaderParameters.java index fc52649c022..ea08c9712b3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/HeaderParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.commonparamsubdir.post.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T someHeader(String value) { } } - public static class HeaderParametersMapBuilder implements BaseBuilder, SetterForSomeHeader { + public static class HeaderParametersMapBuilder implements GenericBuilder>, SetterForSomeHeader { private final Map instance; private static final Set knownKeys = Set.of( "someHeader" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/PathParameters.java index b684ace7141..614b7809e26 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.commonparamsubdir.parameters.parameter0.PathParamSchema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -76,7 +76,7 @@ default T subDir(PathParamSchema0.StringPathParamSchemaEnums0 value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "subDir" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java new file mode 100644 index 00000000000..4af8214fd64 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.paths.fake.delete; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.fake.delete.security.FakeDeleteSecurityRequirementObject0; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class FakeDeleteSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public FakeDeleteSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForFakeDeleteSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterFakeDeleteSecurityRequirementObject0(Map instance); + default T fakeDeleteSecurityRequirementObject0(FakeDeleteSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterFakeDeleteSecurityRequirementObject0(instance); + } + } + + public static class Securities0Builder implements GenericBuilder { + private final Map instance; + public Securities0Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + } + + public static class SecuritiesBuilder implements SetterForFakeDeleteSecurityRequirementObject0 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities0Builder getBuilderAfterFakeDeleteSecurityRequirementObject0(Map instance) { + return new Securities0Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/HeaderParameters.java index 442acd4c508..478275e7fe9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/HeaderParameters.java @@ -16,7 +16,7 @@ import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter1.Schema1; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter4.Schema4; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -110,7 +110,7 @@ default T boolean_group(Schema4.StringSchemaEnums4 value) { } } - public static class HeaderParametersMap0Builder implements BaseBuilder<@Nullable Object>, SetterForBooleanGroup { + public static class HeaderParametersMap0Builder implements GenericBuilder>, SetterForBooleanGroup { private final Map instance; private static final Set knownKeys = Set.of( "required_boolean_group", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/QueryParameters.java index a7b7a454fc6..f02c1961bcc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/QueryParameters.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter3.Schema3; import org.openapijsonschematools.client.paths.fake.delete.parameters.parameter5.Schema5; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -178,7 +178,7 @@ default T string_group(String value) { } } - public static class QueryParametersMap00Builder implements BaseBuilder<@Nullable Object>, SetterForInt64Group, SetterForStringGroup { + public static class QueryParametersMap00Builder implements GenericBuilder>, SetterForInt64Group, SetterForStringGroup { private final Map instance; private static final Set knownKeys = Set.of( "required_int64_group", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java new file mode 100644 index 00000000000..65df1713556 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.fake.delete.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.BearerTest; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class FakeDeleteSecurityRequirementObject0 extends SecurityRequirementObject { + + public FakeDeleteSecurityRequirementObject0( + BearerTest securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/HeaderParameters.java index 8010d650fde..4d76c513734 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/HeaderParameters.java @@ -16,7 +16,7 @@ import org.openapijsonschematools.client.paths.fake.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter1.Schema1; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -105,7 +105,7 @@ default T enum_header_string_array(List value) { } } - public static class HeaderParametersMapBuilder implements BaseBuilder<@Nullable Object>, SetterForEnumHeaderString, SetterForEnumHeaderStringArray { + public static class HeaderParametersMapBuilder implements GenericBuilder>, SetterForEnumHeaderString, SetterForEnumHeaderStringArray { private final Map instance; private static final Set knownKeys = Set.of( "enum_header_string", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/QueryParameters.java index 9d4adff90d2..b8aac7b9994 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/QueryParameters.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.paths.fake.get.parameters.parameter4.Schema4; import org.openapijsonschematools.client.paths.fake.get.parameters.parameter5.Schema5; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -211,7 +211,7 @@ default T enum_query_string_array(List value) { } } - public static class QueryParametersMapBuilder implements BaseBuilder<@Nullable Object>, SetterForEnumQueryDouble, SetterForEnumQueryString, SetterForEnumQueryInteger, SetterForEnumQueryStringArray { + public static class QueryParametersMapBuilder implements GenericBuilder>, SetterForEnumQueryDouble, SetterForEnumQueryString, SetterForEnumQueryInteger, SetterForEnumQueryStringArray { private final Map instance; private static final Set knownKeys = Set.of( "enum_query_double", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java index b4f7d446209..228c57102f8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -356,7 +356,7 @@ default T enum_form_string(StringEnumFormStringEnums value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForEnumFormStringArray, SetterForEnumFormString { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForEnumFormStringArray, SetterForEnumFormString { private final Map instance; private static final Set knownKeys = Set.of( "enum_form_string_array", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java new file mode 100644 index 00000000000..d24bb81c122 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.paths.fake.post; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.fake.post.security.FakePostSecurityRequirementObject0; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class FakePostSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public FakePostSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForFakePostSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterFakePostSecurityRequirementObject0(Map instance); + default T fakePostSecurityRequirementObject0(FakePostSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterFakePostSecurityRequirementObject0(instance); + } + } + + public static class Securities0Builder implements GenericBuilder { + private final Map instance; + public Securities0Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + } + + public static class SecuritiesBuilder implements SetterForFakePostSecurityRequirementObject0 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities0Builder getBuilderAfterFakePostSecurityRequirementObject0(Map instance) { + return new Securities0Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java index 1e3a95d9568..81b667ea64e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -16,8 +16,8 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; import org.openapijsonschematools.client.schemas.DateJsonSchema; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.Int64JsonSchema; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; @@ -950,7 +950,7 @@ default T callback(String value) { } } - public static class SchemaMap0000Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForIntegerSchema, SetterForInt32, SetterForInt64, SetterForFloatSchema, SetterForStringSchema, SetterForBinary, SetterForDate, SetterForDateTime, SetterForPassword, SetterForCallback { + public static class SchemaMap0000Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForIntegerSchema, SetterForInt32, SetterForInt64, SetterForFloatSchema, SetterForStringSchema, SetterForBinary, SetterForDate, SetterForDateTime, SetterForPassword, SetterForCallback { private final Map instance; private static final Set knownKeys = Set.of( "byte", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java new file mode 100644 index 00000000000..e23352dfc38 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.fake.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.HttpBasicTest; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class FakePostSecurityRequirementObject0 extends SecurityRequirementObject { + + public FakePostSecurityRequirementObject0( + HttpBasicTest securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/QueryParameters.java index d16994e04be..9fdf4bd599c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakebodywithqueryparams/put/QueryParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.fakebodywithqueryparams.put.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T query(String value) { } } - public static class QueryParametersMap0Builder implements BaseBuilder { + public static class QueryParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "query" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/QueryParameters.java index 8ffdbc35901..ca7efe12ae5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakecasesensitiveparams/put/QueryParameters.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter1.Schema1; import org.openapijsonschematools.client.paths.fakecasesensitiveparams.put.parameters.parameter2.Schema2; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -116,7 +116,7 @@ default T some_var(String value) { } } - public static class QueryParametersMap000Builder implements BaseBuilder<@Nullable Object> { + public static class QueryParametersMap000Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "SomeVar", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java new file mode 100644 index 00000000000..d3dbb03abd3 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.paths.fakeclassnametest.patch; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.fakeclassnametest.patch.security.FakeclassnametestPatchSecurityRequirementObject0; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class FakeclassnametestPatchSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public FakeclassnametestPatchSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForFakeclassnametestPatchSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterFakeclassnametestPatchSecurityRequirementObject0(Map instance); + default T fakeclassnametestPatchSecurityRequirementObject0(FakeclassnametestPatchSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterFakeclassnametestPatchSecurityRequirementObject0(instance); + } + } + + public static class Securities0Builder implements GenericBuilder { + private final Map instance; + public Securities0Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + } + + public static class SecuritiesBuilder implements SetterForFakeclassnametestPatchSecurityRequirementObject0 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities0Builder getBuilderAfterFakeclassnametestPatchSecurityRequirementObject0(Map instance) { + return new Securities0Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java new file mode 100644 index 00000000000..7ea4338462f --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.fakeclassnametest.patch.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKeyQuery; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class FakeclassnametestPatchSecurityRequirementObject0 extends SecurityRequirementObject { + + public FakeclassnametestPatchSecurityRequirementObject0( + ApiKeyQuery securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/PathParameters.java index 95bd94921c0..f22c57f3160 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.fakedeletecoffeeid.delete.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T id(String value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "id" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java index 6ea58784c19..306efc50223 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlineadditionalproperties/post/requestbody/content/applicationjson/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -67,7 +67,7 @@ default T additionalProperty(String key, String value) throws InvalidAdditionalP } } - public static class SchemaMapBuilder implements BaseBuilder, SetterForAdditionalProperties { + public static class SchemaMapBuilder implements GenericBuilder>, SetterForAdditionalProperties { private final Map instance; private static final Set knownKeys = Set.of(); public Set getKnownKeys() { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/QueryParameters.java index f6da55f7617..1b04f6f7f3e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/QueryParameters.java @@ -16,7 +16,7 @@ import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter0.Schema0; import org.openapijsonschematools.client.paths.fakeinlinecomposition.post.parameters.parameter1.Schema1; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -147,7 +147,7 @@ default T compositionInProperty(Map value) { } } - public static class QueryParametersMapBuilder implements BaseBuilder<@Nullable Object>, SetterForCompositionAtRoot, SetterForCompositionInProperty { + public static class QueryParametersMapBuilder implements GenericBuilder>, SetterForCompositionAtRoot, SetterForCompositionInProperty { private final Map instance; private static final Set knownKeys = Set.of( "compositionAtRoot", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java index d8a3d76a9f7..9204def8a24 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/parameters/parameter1/Schema1.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -362,7 +362,7 @@ default T someProp(Map value) { } } - public static class SchemaMapBuilder1 extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSomeProp1 { + public static class SchemaMapBuilder1 extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSomeProp1 { private final Map instance; private static final Set knownKeys = Set.of( "someProp" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java index 6383f2cfb44..cbdd9771330 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/requestbody/content/multipartformdata/Schema.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -362,7 +362,7 @@ default T someProp(Map value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSomeProp { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSomeProp { private final Map instance; private static final Set knownKeys = Set.of( "someProp" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java index a8f6dce87ee..ff74a074a4d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeinlinecomposition/post/responses/response200/content/multipartformdata/Schema.java @@ -17,7 +17,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -362,7 +362,7 @@ default T someProp(Map value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForSomeProp { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForSomeProp { private final Map instance; private static final Set knownKeys = Set.of( "someProp" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java index 2d4296f159f..b7b72594c40 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakejsonformdata/get/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -109,7 +109,7 @@ default T param2(String value) { } } - public static class SchemaMap00Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object> { + public static class SchemaMap00Builder extends UnsetAddPropsSetter implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "param", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java index 3c9c9013f82..8008942d3c5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/applicationjson/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T a(String value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForA { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForA { private final Map instance; private static final Set knownKeys = Set.of( "a" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java index d4cd446905c..199700b15b9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplerequestbodycontenttypes/post/requestbody/content/multipartformdata/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T b(String value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForB { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForB { private final Map instance; private static final Set knownKeys = Set.of( "b" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java new file mode 100644 index 00000000000..477a06e5f7b --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java @@ -0,0 +1,158 @@ +package org.openapijsonschematools.client.paths.fakemultiplesecurities.get; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security.FakemultiplesecuritiesGetSecurityRequirementObject0; +import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security.FakemultiplesecuritiesGetSecurityRequirementObject1; +import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security.FakemultiplesecuritiesGetSecurityRequirementObject2; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class FakemultiplesecuritiesGetSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public FakemultiplesecuritiesGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForFakemultiplesecuritiesGetSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance); + default T fakemultiplesecuritiesGetSecurityRequirementObject0(FakemultiplesecuritiesGetSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(instance); + } + } + + public interface SetterForFakemultiplesecuritiesGetSecurityRequirementObject1 { + Map getInstance(); + T getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance); + default T fakemultiplesecuritiesGetSecurityRequirementObject1(FakemultiplesecuritiesGetSecurityRequirementObject1 security1) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_1, security1); + return getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(instance); + } + } + + public interface SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { + Map getInstance(); + T getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance); + default T fakemultiplesecuritiesGetSecurityRequirementObject2(FakemultiplesecuritiesGetSecurityRequirementObject2 security2) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_2, security2); + return getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(instance); + } + } + + public static class Securities011Builder implements GenericBuilder, SetterForFakemultiplesecuritiesGetSecurityRequirementObject1, SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { + private final Map instance; + public Securities011Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities011Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance) { + return this; + } + public Securities011Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance) { + return this; + } + } + + public static class Securities101Builder implements GenericBuilder, SetterForFakemultiplesecuritiesGetSecurityRequirementObject0, SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { + private final Map instance; + public Securities101Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities101Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance) { + return this; + } + public Securities101Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance) { + return this; + } + } + + public static class Securities110Builder implements GenericBuilder, SetterForFakemultiplesecuritiesGetSecurityRequirementObject0, SetterForFakemultiplesecuritiesGetSecurityRequirementObject1 { + private final Map instance; + public Securities110Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities110Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance) { + return this; + } + public Securities110Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance) { + return this; + } + } + + public static class SecuritiesBuilder implements SetterForFakemultiplesecuritiesGetSecurityRequirementObject0, SetterForFakemultiplesecuritiesGetSecurityRequirementObject1, SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities011Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance) { + return new Securities011Builder(instance); + } + public Securities101Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance) { + return new Securities101Builder(instance); + } + public Securities110Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance) { + return new Securities110Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0, + SECURITY_1, + SECURITY_2 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.java new file mode 100644 index 00000000000..bc95dd4ca2b --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.java @@ -0,0 +1,5 @@ +package org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security; + +import org.openapijsonschematools.client.securityrequirementobjects.EmptySecurityRequirementObject; + +public class FakemultiplesecuritiesGetSecurityRequirementObject0 extends EmptySecurityRequirementObject {} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java new file mode 100644 index 00000000000..2b33f55bb18 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java @@ -0,0 +1,32 @@ +package org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKey; +import org.openapijsonschematools.client.components.securityschemes.HttpBasicTest; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class FakemultiplesecuritiesGetSecurityRequirementObject1 extends SecurityRequirementObject { + + public FakemultiplesecuritiesGetSecurityRequirementObject1( + HttpBasicTest securityScheme0, + ApiKey securityScheme1 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ), + new AbstractMap.SimpleEntry>( + securityScheme1, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java new file mode 100644 index 00000000000..7089b54db06 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class FakemultiplesecuritiesGetSecurityRequirementObject2 extends SecurityRequirementObject { + + public FakemultiplesecuritiesGetSecurityRequirementObject2( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/QueryParameters.java index 56fd679e07f..e0881b32a37 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/QueryParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.fakeobjinquery.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T mapBean(Map value) { } } - public static class QueryParametersMapBuilder implements BaseBuilder>, SetterForMapBean { + public static class QueryParametersMapBuilder implements GenericBuilder>>, SetterForMapBean { private final Map> instance; private static final Set knownKeys = Set.of( "mapBean" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java index 78b7bc036e3..d17861b2973 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeobjinquery/get/parameters/parameter0/Schema0.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -80,7 +80,7 @@ default T keyword(String value) { } } - public static class SchemaMapBuilder0 extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForKeyword0 { + public static class SchemaMapBuilder0 extends UnsetAddPropsSetter implements GenericBuilder>, SetterForKeyword0 { private final Map instance; private static final Set knownKeys = Set.of( "keyword" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java index a0c17e03fbf..1ad88b6612e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/CookieParameters.java @@ -19,7 +19,7 @@ import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter17.Schema17; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter18.Schema18; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -148,7 +148,7 @@ default T self(String value) { } } - public static class CookieParametersMapBuilder implements BaseBuilder<@Nullable Object>, SetterForSchema1, SetterForAB, SetterForAb, SetterForAB1, SetterForSelf { + public static class CookieParametersMapBuilder implements GenericBuilder>, SetterForSchema1, SetterForAB, SetterForAb, SetterForAB1, SetterForSelf { private final Map instance; private static final Set knownKeys = Set.of( "1", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java index 79816df277b..95b38462ec4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/HeaderParameters.java @@ -18,7 +18,7 @@ import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter7.Schema7; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter8.Schema8; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -125,7 +125,7 @@ default T self(String value) { } } - public static class HeaderParametersMapBuilder implements BaseBuilder<@Nullable Object>, SetterForSchema1, SetterForAB, SetterForAB1, SetterForSelf { + public static class HeaderParametersMapBuilder implements GenericBuilder>, SetterForSchema1, SetterForAB, SetterForAB1, SetterForSelf { private final Map instance; private static final Set knownKeys = Set.of( "1", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/PathParameters.java index 724e8fe6de1..b9c726ea610 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/PathParameters.java @@ -19,7 +19,7 @@ import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter13.Schema13; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter9.Schema9; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -142,7 +142,7 @@ default T self(String value) { } } - public static class PathParametersMap00000Builder implements BaseBuilder<@Nullable Object> { + public static class PathParametersMap00000Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "1", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java index 550bb1aa279..0998062c506 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/QueryParameters.java @@ -19,7 +19,7 @@ import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter3.Schema3; import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.parameter4.Schema4; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -148,7 +148,7 @@ default T self(String value) { } } - public static class QueryParametersMapBuilder implements BaseBuilder<@Nullable Object>, SetterForSchema1, SetterForAB, SetterForAb, SetterForAB1, SetterForSelf { + public static class QueryParametersMapBuilder implements GenericBuilder>, SetterForSchema1, SetterForAB, SetterForAb, SetterForAB1, SetterForSelf { private final Map instance; private static final Set knownKeys = Set.of( "1", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java new file mode 100644 index 00000000000..b21e776ae12 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.security.FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class FakepetiduploadimagewithrequiredfilePostSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public FakepetiduploadimagewithrequiredfilePostSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(Map instance); + default T fakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(instance); + } + } + + public static class Securities0Builder implements GenericBuilder { + private final Map instance; + public Securities0Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + } + + public static class SecuritiesBuilder implements SetterForFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities0Builder getBuilderAfterFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(Map instance) { + return new Securities0Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java index 4c56ec57cdc..76ec522ae3f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -88,7 +88,7 @@ default T petId(double value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "petId" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java index 23f5f12565a..1d341b0d12b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -113,7 +113,7 @@ default T additionalMetadata(String value) { } } - public static class SchemaMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForAdditionalMetadata { + public static class SchemaMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForAdditionalMetadata { private final Map instance; private static final Set knownKeys = Set.of( "requiredFile", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java new file mode 100644 index 00000000000..fcb32e6dfca --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 extends SecurityRequirementObject { + + public FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java index a726a662f9c..e30832ad90a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.fakequeryparamwithjsoncontenttype.get.parameters.parameter0.content.applicationjson.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -118,7 +118,7 @@ default T someParam(Map value) { } } - public static class QueryParametersMap0Builder implements BaseBuilder<@Nullable Object> { + public static class QueryParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "someParam" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/QueryParameters.java index 9754d7a42be..4c60be3b3ee 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakerefobjinquery/get/QueryParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T mapBean(Map value) { } } - public static class QueryParametersMapBuilder implements BaseBuilder>, SetterForMapBean { + public static class QueryParametersMapBuilder implements GenericBuilder>>, SetterForMapBean { private final Map> instance; private static final Set knownKeys = Set.of( "mapBean" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/QueryParameters.java index ad4559e369f..69dec00f2b3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/faketestqueryparamters/put/QueryParameters.java @@ -20,7 +20,7 @@ import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter3.Schema3; import org.openapijsonschematools.client.paths.faketestqueryparamters.put.parameters.parameter4.Schema4; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -179,7 +179,7 @@ default T url(List value) { } } - public static class QueryParametersMap000000Builder implements BaseBuilder<@Nullable Object> { + public static class QueryParametersMap000000Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "context", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java index 09dd0ae84f4..11a14e6c2b3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfile/post/requestbody/content/multipartformdata/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -113,7 +113,7 @@ default T additionalMetadata(String value) { } } - public static class SchemaMap0Builder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForAdditionalMetadata { + public static class SchemaMap0Builder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForAdditionalMetadata { private final Map instance; private static final Set knownKeys = Set.of( "file", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java index ee882195bde..a6a17d38b52 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeuploadfiles/post/requestbody/content/multipartformdata/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenList; @@ -181,7 +181,7 @@ default T files(List value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForFiles { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForFiles { private final Map instance; private static final Set knownKeys = Set.of( "files" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java index 5981d8c5acb..4e99cb35d3d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/responses/responsedefault/content/applicationjson/Schema.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -59,7 +59,7 @@ default T setString(Map value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForStringSchema { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForStringSchema { private final Map instance; private static final Set knownKeys = Set.of( "string" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/servers/server1/Variables.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/servers/server1/Variables.java index e40f854f0f4..c84db1e0f32 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/servers/server1/Variables.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/foo/get/servers/server1/Variables.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -154,7 +154,7 @@ default T version(StringVersionEnums value) { } } - public static class VariablesMap0Builder implements BaseBuilder { + public static class VariablesMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "version" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java new file mode 100644 index 00000000000..7f5e8981eff --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java @@ -0,0 +1,158 @@ +package org.openapijsonschematools.client.paths.pet.post; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.pet.post.security.PetPostSecurityRequirementObject0; +import org.openapijsonschematools.client.paths.pet.post.security.PetPostSecurityRequirementObject1; +import org.openapijsonschematools.client.paths.pet.post.security.PetPostSecurityRequirementObject2; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetPostSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetPostSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetPostSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetPostSecurityRequirementObject0(Map instance); + default T petPostSecurityRequirementObject0(PetPostSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetPostSecurityRequirementObject0(instance); + } + } + + public interface SetterForPetPostSecurityRequirementObject1 { + Map getInstance(); + T getBuilderAfterPetPostSecurityRequirementObject1(Map instance); + default T petPostSecurityRequirementObject1(PetPostSecurityRequirementObject1 security1) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_1, security1); + return getBuilderAfterPetPostSecurityRequirementObject1(instance); + } + } + + public interface SetterForPetPostSecurityRequirementObject2 { + Map getInstance(); + T getBuilderAfterPetPostSecurityRequirementObject2(Map instance); + default T petPostSecurityRequirementObject2(PetPostSecurityRequirementObject2 security2) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_2, security2); + return getBuilderAfterPetPostSecurityRequirementObject2(instance); + } + } + + public static class Securities011Builder implements GenericBuilder, SetterForPetPostSecurityRequirementObject1, SetterForPetPostSecurityRequirementObject2 { + private final Map instance; + public Securities011Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities011Builder getBuilderAfterPetPostSecurityRequirementObject1(Map instance) { + return this; + } + public Securities011Builder getBuilderAfterPetPostSecurityRequirementObject2(Map instance) { + return this; + } + } + + public static class Securities101Builder implements GenericBuilder, SetterForPetPostSecurityRequirementObject0, SetterForPetPostSecurityRequirementObject2 { + private final Map instance; + public Securities101Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities101Builder getBuilderAfterPetPostSecurityRequirementObject0(Map instance) { + return this; + } + public Securities101Builder getBuilderAfterPetPostSecurityRequirementObject2(Map instance) { + return this; + } + } + + public static class Securities110Builder implements GenericBuilder, SetterForPetPostSecurityRequirementObject0, SetterForPetPostSecurityRequirementObject1 { + private final Map instance; + public Securities110Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities110Builder getBuilderAfterPetPostSecurityRequirementObject0(Map instance) { + return this; + } + public Securities110Builder getBuilderAfterPetPostSecurityRequirementObject1(Map instance) { + return this; + } + } + + public static class SecuritiesBuilder implements SetterForPetPostSecurityRequirementObject0, SetterForPetPostSecurityRequirementObject1, SetterForPetPostSecurityRequirementObject2 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities011Builder getBuilderAfterPetPostSecurityRequirementObject0(Map instance) { + return new Securities011Builder(instance); + } + public Securities101Builder getBuilderAfterPetPostSecurityRequirementObject1(Map instance) { + return new Securities101Builder(instance); + } + public Securities110Builder getBuilderAfterPetPostSecurityRequirementObject2(Map instance) { + return new Securities110Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0, + SECURITY_1, + SECURITY_2 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java new file mode 100644 index 00000000000..2011933759d --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.pet.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKey; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetPostSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetPostSecurityRequirementObject0( + ApiKey securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java new file mode 100644 index 00000000000..2b18e0ed204 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.pet.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.HttpSignatureTest; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetPostSecurityRequirementObject1 extends SecurityRequirementObject { + + public PetPostSecurityRequirementObject1( + HttpSignatureTest securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java new file mode 100644 index 00000000000..8035e52c8ae --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.pet.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetPostSecurityRequirementObject2 extends SecurityRequirementObject { + + public PetPostSecurityRequirementObject2( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java new file mode 100644 index 00000000000..bd36d2668be --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java @@ -0,0 +1,118 @@ +package org.openapijsonschematools.client.paths.pet.put; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.pet.put.security.PetPutSecurityRequirementObject0; +import org.openapijsonschematools.client.paths.pet.put.security.PetPutSecurityRequirementObject1; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetPutSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetPutSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetPutSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetPutSecurityRequirementObject0(Map instance); + default T petPutSecurityRequirementObject0(PetPutSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetPutSecurityRequirementObject0(instance); + } + } + + public interface SetterForPetPutSecurityRequirementObject1 { + Map getInstance(); + T getBuilderAfterPetPutSecurityRequirementObject1(Map instance); + default T petPutSecurityRequirementObject1(PetPutSecurityRequirementObject1 security1) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_1, security1); + return getBuilderAfterPetPutSecurityRequirementObject1(instance); + } + } + + public static class Securities01Builder implements GenericBuilder, SetterForPetPutSecurityRequirementObject1 { + private final Map instance; + public Securities01Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetPutSecurityRequirementObject1(Map instance) { + return this; + } + } + + public static class Securities10Builder implements GenericBuilder, SetterForPetPutSecurityRequirementObject0 { + private final Map instance; + public Securities10Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities10Builder getBuilderAfterPetPutSecurityRequirementObject0(Map instance) { + return this; + } + } + + public static class SecuritiesBuilder implements SetterForPetPutSecurityRequirementObject0, SetterForPetPutSecurityRequirementObject1 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetPutSecurityRequirementObject0(Map instance) { + return new Securities01Builder(instance); + } + public Securities10Builder getBuilderAfterPetPutSecurityRequirementObject1(Map instance) { + return new Securities10Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0, + SECURITY_1 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java new file mode 100644 index 00000000000..67b5f0b0e00 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.pet.put.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.HttpSignatureTest; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetPutSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetPutSecurityRequirementObject0( + HttpSignatureTest securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java new file mode 100644 index 00000000000..a31e5c26d7a --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.pet.put.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetPutSecurityRequirementObject1 extends SecurityRequirementObject { + + public PetPutSecurityRequirementObject1( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java new file mode 100644 index 00000000000..46047669e5d --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java @@ -0,0 +1,158 @@ +package org.openapijsonschematools.client.paths.petfindbystatus.get; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.petfindbystatus.get.security.PetfindbystatusGetSecurityRequirementObject0; +import org.openapijsonschematools.client.paths.petfindbystatus.get.security.PetfindbystatusGetSecurityRequirementObject1; +import org.openapijsonschematools.client.paths.petfindbystatus.get.security.PetfindbystatusGetSecurityRequirementObject2; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetfindbystatusGetSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetfindbystatusGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetfindbystatusGetSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance); + default T petfindbystatusGetSecurityRequirementObject0(PetfindbystatusGetSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(instance); + } + } + + public interface SetterForPetfindbystatusGetSecurityRequirementObject1 { + Map getInstance(); + T getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance); + default T petfindbystatusGetSecurityRequirementObject1(PetfindbystatusGetSecurityRequirementObject1 security1) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_1, security1); + return getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(instance); + } + } + + public interface SetterForPetfindbystatusGetSecurityRequirementObject2 { + Map getInstance(); + T getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance); + default T petfindbystatusGetSecurityRequirementObject2(PetfindbystatusGetSecurityRequirementObject2 security2) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_2, security2); + return getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(instance); + } + } + + public static class Securities011Builder implements GenericBuilder, SetterForPetfindbystatusGetSecurityRequirementObject1, SetterForPetfindbystatusGetSecurityRequirementObject2 { + private final Map instance; + public Securities011Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities011Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance) { + return this; + } + public Securities011Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance) { + return this; + } + } + + public static class Securities101Builder implements GenericBuilder, SetterForPetfindbystatusGetSecurityRequirementObject0, SetterForPetfindbystatusGetSecurityRequirementObject2 { + private final Map instance; + public Securities101Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities101Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance) { + return this; + } + public Securities101Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance) { + return this; + } + } + + public static class Securities110Builder implements GenericBuilder, SetterForPetfindbystatusGetSecurityRequirementObject0, SetterForPetfindbystatusGetSecurityRequirementObject1 { + private final Map instance; + public Securities110Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities110Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance) { + return this; + } + public Securities110Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance) { + return this; + } + } + + public static class SecuritiesBuilder implements SetterForPetfindbystatusGetSecurityRequirementObject0, SetterForPetfindbystatusGetSecurityRequirementObject1, SetterForPetfindbystatusGetSecurityRequirementObject2 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities011Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance) { + return new Securities011Builder(instance); + } + public Securities101Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance) { + return new Securities101Builder(instance); + } + public Securities110Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance) { + return new Securities110Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0, + SECURITY_1, + SECURITY_2 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/QueryParameters.java index d15dd9e3dd0..aeb4ea1bbb2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/QueryParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.petfindbystatus.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenList; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -71,7 +71,7 @@ default T status(List value) { } } - public static class QueryParametersMap0Builder implements BaseBuilder> { + public static class QueryParametersMap0Builder implements GenericBuilder>> { private final Map> instance; private static final Set knownKeys = Set.of( "status" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java new file mode 100644 index 00000000000..5f7963ea5d1 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petfindbystatus.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKey; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetfindbystatusGetSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetfindbystatusGetSecurityRequirementObject0( + ApiKey securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java new file mode 100644 index 00000000000..25e4dde9cbc --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petfindbystatus.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.HttpSignatureTest; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetfindbystatusGetSecurityRequirementObject1 extends SecurityRequirementObject { + + public PetfindbystatusGetSecurityRequirementObject1( + HttpSignatureTest securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java new file mode 100644 index 00000000000..836c313499e --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petfindbystatus.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetfindbystatusGetSecurityRequirementObject2 extends SecurityRequirementObject { + + public PetfindbystatusGetSecurityRequirementObject2( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/server1/Variables.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/server1/Variables.java index 3b7616aaf5f..8add5338865 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/server1/Variables.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/servers/server1/Variables.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -154,7 +154,7 @@ default T version(StringVersionEnums value) { } } - public static class VariablesMap0Builder implements BaseBuilder { + public static class VariablesMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "version" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java new file mode 100644 index 00000000000..c388438bf43 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java @@ -0,0 +1,118 @@ +package org.openapijsonschematools.client.paths.petfindbytags.get; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.petfindbytags.get.security.PetfindbytagsGetSecurityRequirementObject0; +import org.openapijsonschematools.client.paths.petfindbytags.get.security.PetfindbytagsGetSecurityRequirementObject1; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetfindbytagsGetSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetfindbytagsGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetfindbytagsGetSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(Map instance); + default T petfindbytagsGetSecurityRequirementObject0(PetfindbytagsGetSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(instance); + } + } + + public interface SetterForPetfindbytagsGetSecurityRequirementObject1 { + Map getInstance(); + T getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(Map instance); + default T petfindbytagsGetSecurityRequirementObject1(PetfindbytagsGetSecurityRequirementObject1 security1) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_1, security1); + return getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(instance); + } + } + + public static class Securities01Builder implements GenericBuilder, SetterForPetfindbytagsGetSecurityRequirementObject1 { + private final Map instance; + public Securities01Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(Map instance) { + return this; + } + } + + public static class Securities10Builder implements GenericBuilder, SetterForPetfindbytagsGetSecurityRequirementObject0 { + private final Map instance; + public Securities10Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities10Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(Map instance) { + return this; + } + } + + public static class SecuritiesBuilder implements SetterForPetfindbytagsGetSecurityRequirementObject0, SetterForPetfindbytagsGetSecurityRequirementObject1 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(Map instance) { + return new Securities01Builder(instance); + } + public Securities10Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(Map instance) { + return new Securities10Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0, + SECURITY_1 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/QueryParameters.java index 6b673a97825..38cdf47331d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/QueryParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.petfindbytags.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenList; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -71,7 +71,7 @@ default T tags(List value) { } } - public static class QueryParametersMap0Builder implements BaseBuilder> { + public static class QueryParametersMap0Builder implements GenericBuilder>> { private final Map> instance; private static final Set knownKeys = Set.of( "tags" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java new file mode 100644 index 00000000000..54decd96811 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petfindbytags.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.HttpSignatureTest; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetfindbytagsGetSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetfindbytagsGetSecurityRequirementObject0( + HttpSignatureTest securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java new file mode 100644 index 00000000000..7988c93c67d --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petfindbytags.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetfindbytagsGetSecurityRequirementObject1 extends SecurityRequirementObject { + + public PetfindbytagsGetSecurityRequirementObject1( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/HeaderParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/HeaderParameters.java index 4f904dc2d4e..5b629217e97 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/HeaderParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/HeaderParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T api_key(String value) { } } - public static class HeaderParametersMapBuilder implements BaseBuilder, SetterForApiKey { + public static class HeaderParametersMapBuilder implements GenericBuilder>, SetterForApiKey { private final Map instance; private static final Set knownKeys = Set.of( "api_key" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PathParameters.java index fb4542d7a3c..fbd3e451c93 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.petpetid.delete.parameters.parameter1.Schema1; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -88,7 +88,7 @@ default T petId(double value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "petId" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java new file mode 100644 index 00000000000..139936218f3 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java @@ -0,0 +1,118 @@ +package org.openapijsonschematools.client.paths.petpetid.delete; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.petpetid.delete.security.PetpetidDeleteSecurityRequirementObject0; +import org.openapijsonschematools.client.paths.petpetid.delete.security.PetpetidDeleteSecurityRequirementObject1; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetpetidDeleteSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetpetidDeleteSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetpetidDeleteSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetpetidDeleteSecurityRequirementObject0(Map instance); + default T petpetidDeleteSecurityRequirementObject0(PetpetidDeleteSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetpetidDeleteSecurityRequirementObject0(instance); + } + } + + public interface SetterForPetpetidDeleteSecurityRequirementObject1 { + Map getInstance(); + T getBuilderAfterPetpetidDeleteSecurityRequirementObject1(Map instance); + default T petpetidDeleteSecurityRequirementObject1(PetpetidDeleteSecurityRequirementObject1 security1) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_1, security1); + return getBuilderAfterPetpetidDeleteSecurityRequirementObject1(instance); + } + } + + public static class Securities01Builder implements GenericBuilder, SetterForPetpetidDeleteSecurityRequirementObject1 { + private final Map instance; + public Securities01Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject1(Map instance) { + return this; + } + } + + public static class Securities10Builder implements GenericBuilder, SetterForPetpetidDeleteSecurityRequirementObject0 { + private final Map instance; + public Securities10Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities10Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject0(Map instance) { + return this; + } + } + + public static class SecuritiesBuilder implements SetterForPetpetidDeleteSecurityRequirementObject0, SetterForPetpetidDeleteSecurityRequirementObject1 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject0(Map instance) { + return new Securities01Builder(instance); + } + public Securities10Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject1(Map instance) { + return new Securities10Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0, + SECURITY_1 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java new file mode 100644 index 00000000000..f205d82aaa2 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petpetid.delete.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKey; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetpetidDeleteSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetpetidDeleteSecurityRequirementObject0( + ApiKey securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java new file mode 100644 index 00000000000..c8fbefaa8ca --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petpetid.delete.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetpetidDeleteSecurityRequirementObject1 extends SecurityRequirementObject { + + public PetpetidDeleteSecurityRequirementObject1( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PathParameters.java index 61c2cc7fc98..515097cd479 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.petpetid.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -88,7 +88,7 @@ default T petId(double value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "petId" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java new file mode 100644 index 00000000000..d67e543c3b0 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.paths.petpetid.get; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.petpetid.get.security.PetpetidGetSecurityRequirementObject0; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetpetidGetSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetpetidGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetpetidGetSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetpetidGetSecurityRequirementObject0(Map instance); + default T petpetidGetSecurityRequirementObject0(PetpetidGetSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetpetidGetSecurityRequirementObject0(instance); + } + } + + public static class Securities0Builder implements GenericBuilder { + private final Map instance; + public Securities0Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + } + + public static class SecuritiesBuilder implements SetterForPetpetidGetSecurityRequirementObject0 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities0Builder getBuilderAfterPetpetidGetSecurityRequirementObject0(Map instance) { + return new Securities0Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java new file mode 100644 index 00000000000..3d5379e04da --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petpetid.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKey; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetpetidGetSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetpetidGetSecurityRequirementObject0( + ApiKey securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PathParameters.java index cd898eb0ff4..7d674cd2e9b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.petpetid.post.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -88,7 +88,7 @@ default T petId(double value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "petId" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java new file mode 100644 index 00000000000..08d457e34c3 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java @@ -0,0 +1,118 @@ +package org.openapijsonschematools.client.paths.petpetid.post; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.petpetid.post.security.PetpetidPostSecurityRequirementObject0; +import org.openapijsonschematools.client.paths.petpetid.post.security.PetpetidPostSecurityRequirementObject1; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetpetidPostSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetpetidPostSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetpetidPostSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetpetidPostSecurityRequirementObject0(Map instance); + default T petpetidPostSecurityRequirementObject0(PetpetidPostSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetpetidPostSecurityRequirementObject0(instance); + } + } + + public interface SetterForPetpetidPostSecurityRequirementObject1 { + Map getInstance(); + T getBuilderAfterPetpetidPostSecurityRequirementObject1(Map instance); + default T petpetidPostSecurityRequirementObject1(PetpetidPostSecurityRequirementObject1 security1) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_1, security1); + return getBuilderAfterPetpetidPostSecurityRequirementObject1(instance); + } + } + + public static class Securities01Builder implements GenericBuilder, SetterForPetpetidPostSecurityRequirementObject1 { + private final Map instance; + public Securities01Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetpetidPostSecurityRequirementObject1(Map instance) { + return this; + } + } + + public static class Securities10Builder implements GenericBuilder, SetterForPetpetidPostSecurityRequirementObject0 { + private final Map instance; + public Securities10Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + public Map getInstance() { + return instance; + } + public Securities10Builder getBuilderAfterPetpetidPostSecurityRequirementObject0(Map instance) { + return this; + } + } + + public static class SecuritiesBuilder implements SetterForPetpetidPostSecurityRequirementObject0, SetterForPetpetidPostSecurityRequirementObject1 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities01Builder getBuilderAfterPetpetidPostSecurityRequirementObject0(Map instance) { + return new Securities01Builder(instance); + } + public Securities10Builder getBuilderAfterPetpetidPostSecurityRequirementObject1(Map instance) { + return new Securities10Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0, + SECURITY_1 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java index 6bd5250c5fd..72a38711398 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -113,7 +113,7 @@ default T status(String value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForName, SetterForStatus { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForName, SetterForStatus { private final Map instance; private static final Set knownKeys = Set.of( "name", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java new file mode 100644 index 00000000000..eaecb4861a9 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petpetid.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKey; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetpetidPostSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetpetidPostSecurityRequirementObject0( + ApiKey securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java new file mode 100644 index 00000000000..adbd1378eef --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petpetid.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetpetidPostSecurityRequirementObject1 extends SecurityRequirementObject { + + public PetpetidPostSecurityRequirementObject1( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PathParameters.java index 819bb4f2f69..5e8fbb5171f 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.petpetiduploadimage.post.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -88,7 +88,7 @@ default T petId(double value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "petId" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java new file mode 100644 index 00000000000..d0823b36732 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.paths.petpetiduploadimage.post; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.petpetiduploadimage.post.security.PetpetiduploadimagePostSecurityRequirementObject0; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class PetpetiduploadimagePostSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public PetpetiduploadimagePostSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForPetpetiduploadimagePostSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterPetpetiduploadimagePostSecurityRequirementObject0(Map instance); + default T petpetiduploadimagePostSecurityRequirementObject0(PetpetiduploadimagePostSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterPetpetiduploadimagePostSecurityRequirementObject0(instance); + } + } + + public static class Securities0Builder implements GenericBuilder { + private final Map instance; + public Securities0Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + } + + public static class SecuritiesBuilder implements SetterForPetpetiduploadimagePostSecurityRequirementObject0 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities0Builder getBuilderAfterPetpetiduploadimagePostSecurityRequirementObject0(Map instance) { + return new Securities0Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java index c7351e2a350..d5137386764 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/Schema.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.InvalidTypeException; import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.StringJsonSchema; import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter; import org.openapijsonschematools.client.schemas.validation.FrozenMap; @@ -114,7 +114,7 @@ default T file(String value) { } } - public static class SchemaMapBuilder extends UnsetAddPropsSetter implements BaseBuilder<@Nullable Object>, SetterForAdditionalMetadata, SetterForFile { + public static class SchemaMapBuilder extends UnsetAddPropsSetter implements GenericBuilder>, SetterForAdditionalMetadata, SetterForFile { private final Map instance; private static final Set knownKeys = Set.of( "additionalMetadata", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java new file mode 100644 index 00000000000..cab7673c4a9 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.petpetiduploadimage.post.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.PetstoreAuth; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class PetpetiduploadimagePostSecurityRequirementObject0 extends SecurityRequirementObject { + + public PetpetiduploadimagePostSecurityRequirementObject0( + PetstoreAuth securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of("write:pets", "read:pets") + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java new file mode 100644 index 00000000000..51a939b6530 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java @@ -0,0 +1,81 @@ +package org.openapijsonschematools.client.paths.storeinventory.get; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.openapijsonschematools.client.paths.storeinventory.get.security.StoreinventoryGetSecurityRequirementObject0; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; +import org.openapijsonschematools.client.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class StoreinventoryGetSecurityInfo implements SecurityRequirementObjectProvider { + final private Securities securities; + final private SecurityIndex securityIndex; + + public StoreinventoryGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } + + public interface SetterForStoreinventoryGetSecurityRequirementObject0 { + Map getInstance(); + T getBuilderAfterStoreinventoryGetSecurityRequirementObject0(Map instance); + default T storeinventoryGetSecurityRequirementObject0(StoreinventoryGetSecurityRequirementObject0 security0) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_0, security0); + return getBuilderAfterStoreinventoryGetSecurityRequirementObject0(instance); + } + } + + public static class Securities0Builder implements GenericBuilder { + private final Map instance; + public Securities0Builder(Map instance) { + this.instance = instance; + } + public Securities build() { + return new Securities(instance); + } + } + + public static class SecuritiesBuilder implements SetterForStoreinventoryGetSecurityRequirementObject0 { + private final Map instance; + public SecuritiesBuilder() { + this.instance = new HashMap<>(); + } + public Map getInstance() { + return instance; + } + public Securities0Builder getBuilderAfterStoreinventoryGetSecurityRequirementObject0(Map instance) { + return new Securities0Builder(instance); + } + } + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + SECURITY_0 + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java new file mode 100644 index 00000000000..5ad3dab3eea --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java @@ -0,0 +1,26 @@ +package org.openapijsonschematools.client.paths.storeinventory.get.security; + +import org.checkerframework.checker.nullness.qual.Nullable; +import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.components.securityschemes.ApiKey; + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class StoreinventoryGetSecurityRequirementObject0 extends SecurityRequirementObject { + + public StoreinventoryGetSecurityRequirementObject0( + ApiKey securityScheme0 + ) { + super( + Map.ofEntries( + new AbstractMap.SimpleEntry>( + securityScheme0, + List.of() + ) + ) + ); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/PathParameters.java index 6eea031df7b..eee2bbca0ae 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.storeorderorderid.delete.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T order_id(String value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "order_id" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/PathParameters.java index d5d547217c3..c04bf6e2596 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.paths.storeorderorderid.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -88,7 +88,7 @@ default T order_id(double value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "order_id" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/QueryParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/QueryParameters.java index 1c8e7112dd2..d09063fe6be 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/QueryParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/QueryParameters.java @@ -16,7 +16,7 @@ import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter0.Schema0; import org.openapijsonschematools.client.paths.userlogin.get.parameters.parameter1.Schema1; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -95,7 +95,7 @@ default T username(String value) { } } - public static class QueryParametersMap00Builder implements BaseBuilder<@Nullable Object> { + public static class QueryParametersMap00Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "password", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/response200/Headers.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/response200/Headers.java index 92c5189e184..8d4aeca1e4b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/response200/Headers.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userlogin/get/responses/response200/Headers.java @@ -19,7 +19,7 @@ import org.openapijsonschematools.client.paths.userlogin.get.responses.response200.headers.xexpiresafter.XExpiresAfterSchema; import org.openapijsonschematools.client.paths.userlogin.get.responses.response200.headers.xratelimit.content.applicationjson.XRateLimitSchema; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -149,7 +149,7 @@ default T numberHeader(String value) { } } - public static class HeadersMap000Builder implements BaseBuilder<@Nullable Object>, SetterForXExpiresAfter, SetterForNumberHeader { + public static class HeadersMap000Builder implements GenericBuilder>, SetterForXExpiresAfter, SetterForNumberHeader { private final Map instance; private static final Set knownKeys = Set.of( "X-Rate-Limit", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/PathParameters.java index 4752985afa5..b3a0224930c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/delete/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T username(String value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "username" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/PathParameters.java index af79d478b0f..628993b59c2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/get/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T username(String value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "username" diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/PathParameters.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/PathParameters.java index dc944dd723b..97e420cc5a1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/PathParameters.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/userusername/put/PathParameters.java @@ -15,7 +15,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.validation.FrozenMap; import org.openapijsonschematools.client.schemas.validation.JsonSchema; @@ -70,7 +70,7 @@ default T username(String value) { } } - public static class PathParametersMap0Builder implements BaseBuilder { + public static class PathParametersMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "username" diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java similarity index 58% rename from samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java rename to samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java index da60908b3d6..b33d2e56600 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java @@ -1,12 +1,9 @@ package org.openapijsonschematools.client.schemas; -import java.util.Map; - /** * Builders must implement this class - * For Map builders, * @param the type that the builder returns */ -public interface BaseBuilder { - Map build(); +public interface GenericBuilder { + T build(); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/MapMaker.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/MapMaker.java deleted file mode 100644 index b4b2280c5fa..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/MapMaker.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.openapijsonschematools.client.schemas; - -import java.util.HashMap; -import java.util.Map; - -/** - * A builder for maps that allows in null values - * Schema tests + doc code samples need it - */ -public class MapMaker { - @SafeVarargs - @SuppressWarnings("varargs") - public static Map makeMap(Map.Entry... entries) { - Map map = new HashMap<>(); - for (Map.Entry entry : entries) { - map.put(entry.getKey(), entry.getValue()); - } - return map; - } -} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValueMethod.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValueMethod.java deleted file mode 100644 index d8fd8a7847d..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValueMethod.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.openapijsonschematools.client.schemas.validation; - -public interface EnumValueMethod { - T value(); -} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ValueMethod.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ValueMethod.java deleted file mode 100644 index 522454f6a5d..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ValueMethod.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.openapijsonschematools.client.schemas.validation; - -import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.exceptions.ValidationException; - -public interface ValueMethod { - T value(); -} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/EmptySecurityRequirementObject.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/EmptySecurityRequirementObject.java new file mode 100644 index 00000000000..c51a0ae3b49 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/EmptySecurityRequirementObject.java @@ -0,0 +1,10 @@ +package org.openapijsonschematools.client.securityrequirementobjects; + +import java.util.Map; + +public class EmptySecurityRequirementObject extends SecurityRequirementObject { + + public EmptySecurityRequirementObject() { + super(Map.of()); + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java new file mode 100644 index 00000000000..c264cdd3fc8 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java @@ -0,0 +1,14 @@ +package org.openapijsonschematools.client.securityrequirementobjects; + +import org.openapijsonschematools.client.securityschemes.SecurityScheme; + +import java.util.List; +import java.util.Map; + +public class SecurityRequirementObject { + public final Map> securitySchemeToScopes; + + public SecurityRequirementObject(Map> securitySchemeToScopes) { + this.securitySchemeToScopes = securitySchemeToScopes; + } +} diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObjectProvider.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObjectProvider.java new file mode 100644 index 00000000000..6b0db70c264 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObjectProvider.java @@ -0,0 +1,9 @@ +package org.openapijsonschematools.client.securityrequirementobjects; + +import org.openapijsonschematools.client.exceptions.UnsetPropertyException; +import org.checkerframework.checker.nullness.qual.Nullable; + +public interface SecurityRequirementObjectProvider { + SecurityRequirementObject getSecurityRequirementObject(@Nullable T securityIndex) throws UnsetPropertyException; +} + diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyCookieSecurityScheme.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyCookieSecurityScheme.java new file mode 100644 index 00000000000..47924f48779 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyCookieSecurityScheme.java @@ -0,0 +1,22 @@ +package org.openapijsonschematools.client.securityschemes; + +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.net.http.HttpRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class ApiKeyCookieSecurityScheme implements SecurityScheme { + private final String apiKey; + + protected ApiKeyCookieSecurityScheme(String apiKey) { + this.apiKey = apiKey; + } + + @Override + public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { + List cookieValue = headers.getOrDefault("Cookie", new ArrayList<>()); + cookieValue.add(apiKey); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyHeaderSecurityScheme.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyHeaderSecurityScheme.java new file mode 100644 index 00000000000..b8108586788 --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyHeaderSecurityScheme.java @@ -0,0 +1,24 @@ +package org.openapijsonschematools.client.securityschemes; + +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.net.http.HttpRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class ApiKeyHeaderSecurityScheme implements SecurityScheme { + private final String apiKey; + private final String name; + + protected ApiKeyHeaderSecurityScheme(String apiKey, String name) { + this.apiKey = apiKey; + this.name = name; + } + + @Override + public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { + List headerValue = headers.getOrDefault(name, new ArrayList<>()); + headerValue.add(apiKey); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyInLocation.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyInLocation.java deleted file mode 100644 index 0cd2e69d617..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyInLocation.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.openapijsonschematools.client.securityschemes; - -public enum ApiKeyInLocation{ - QUERY, - HEADER, - COOKIE -} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyQuerySecurityScheme.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyQuerySecurityScheme.java new file mode 100644 index 00000000000..638271f9eaf --- /dev/null +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeyQuerySecurityScheme.java @@ -0,0 +1,23 @@ +package org.openapijsonschematools.client.securityschemes; + +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.net.http.HttpRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class ApiKeyQuerySecurityScheme implements SecurityScheme { + private final String apiKey; + private final String name; + + protected ApiKeyQuerySecurityScheme(String apiKey, String name) { + this.apiKey = apiKey; + this.name = name; + } + + @Override + public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { + throw new UnsupportedOperationException("If you need this, submit a PR adding this feature"); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeySecurityScheme.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeySecurityScheme.java deleted file mode 100644 index 5f9f7dee73c..00000000000 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityschemes/ApiKeySecurityScheme.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.openapijsonschematools.client.securityschemes; - -import org.checkerframework.checker.nullness.qual.Nullable; - -import java.net.http.HttpRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class ApiKeySecurityScheme implements SecurityScheme { - private final String apiKey; - private final @Nullable String name; - private final ApiKeyInLocation inLocation; - - protected ApiKeySecurityScheme(String apiKey, @Nullable String name, ApiKeyInLocation inLocation) { - this.apiKey = apiKey; - this.name = name; - this.inLocation = inLocation; - } - - @Override - public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { - switch (inLocation) { - case COOKIE -> { - List cookieValue = headers.getOrDefault("Cookie", new ArrayList<>()); - cookieValue.add(apiKey); - } - case HEADER -> { - List headerValue = headers.getOrDefault(name, new ArrayList<>()); - headerValue.add(apiKey); - } - case QUERY -> throw new UnsupportedOperationException("If you need this, submit a PR adding this feature"); - } - } -} \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server0/Variables.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server0/Variables.java index 6e474653e6f..b74a73bf2a6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server0/Variables.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server0/Variables.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -260,7 +260,7 @@ default T server(StringServerEnums value) { } } - public static class VariablesMap00Builder implements BaseBuilder { + public static class VariablesMap00Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "port", diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server1/Variables.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server1/Variables.java index 40337fb960d..7598e0752ee 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server1/Variables.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/servers/server1/Variables.java @@ -14,7 +14,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema; -import org.openapijsonschematools.client.schemas.BaseBuilder; +import org.openapijsonschematools.client.schemas.GenericBuilder; import org.openapijsonschematools.client.schemas.NotAnyTypeJsonSchema; import org.openapijsonschematools.client.schemas.SetMaker; import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod; @@ -154,7 +154,7 @@ default T version(StringVersionEnums value) { } } - public static class VariablesMap0Builder implements BaseBuilder { + public static class VariablesMap0Builder implements GenericBuilder> { private final Map instance; private static final Set knownKeys = Set.of( "version" diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessageTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessageTest.java index 6e3526fba16..26d90810268 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessageTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AbstractStepMessageTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AbstractStepMessageTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClassTest.java index 2692a2c5143..dd26157a776 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClassTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesClassTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AdditionalPropertiesClassTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchemaTest.java index 31cfeee16d4..bcf934252d3 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesSchemaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AdditionalPropertiesSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnumsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnumsTest.java index bec2ca84b0d..a446341c727 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnumsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalPropertiesWithArrayOfEnumsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AdditionalPropertiesWithArrayOfEnumsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AddressTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AddressTest.java index 1a0dc0a831e..5ce5a7cf5d9 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AddressTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AddressTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AddressTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalFarmTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalFarmTest.java index 22aba3c4ef1..55f26b9c871 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalFarmTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalFarmTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AnimalFarmTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalTest.java index 3c6de36389a..97d455d8ec8 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnimalTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AnimalTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormatTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormatTest.java index a42ec0f19e8..0ad31f169ad 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormatTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeAndFormatTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AnyTypeAndFormatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeNotStringTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeNotStringTest.java index ab62643d8e4..52f02c1b6dd 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeNotStringTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AnyTypeNotStringTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AnyTypeNotStringTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchemaTest.java index 3d0a7c74ff7..ad06c31ac69 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ApiResponseSchemaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ApiResponseSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleReqTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleReqTest.java index 0b69d7ea666..9f7749a79bd 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleReqTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleReqTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AppleReqTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleTest.java index a6c96ce2312..dd1e597d8e8 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/AppleTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class AppleTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayHoldingAnyTypeTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayHoldingAnyTypeTest.java index b8d10e06513..6b94fb6d3cf 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayHoldingAnyTypeTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayHoldingAnyTypeTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ArrayHoldingAnyTypeTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnlyTest.java index 98f0d3f4bde..cb1769530dc 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnlyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfArrayOfNumberOnlyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ArrayOfArrayOfNumberOnlyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfEnumsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfEnumsTest.java index 2d16307b458..d9027fbfaae 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfEnumsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfEnumsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ArrayOfEnumsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnlyTest.java index b26c72b99fd..341dbf0a6e4 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnlyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayOfNumberOnlyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ArrayOfNumberOnlyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTestTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTestTest.java index 79ccf48d604..8944c314d88 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTestTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTestTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ArrayTestTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayWithValidationsInItemsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayWithValidationsInItemsTest.java index fa94bf1fe6d..fae6ca00c7d 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayWithValidationsInItemsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ArrayWithValidationsInItemsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ArrayWithValidationsInItemsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaReqTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaReqTest.java index b0d333716db..c57f71162b7 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaReqTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaReqTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class BananaReqTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaTest.java index 6ddc375d034..7dd37568562 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BananaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class BananaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BarTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BarTest.java index ccb2a081fd6..371e8019f38 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BarTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BarTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class BarTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BasquePigTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BasquePigTest.java index a7586348a1e..bbf15efed63 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BasquePigTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BasquePigTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class BasquePigTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanEnumTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanEnumTest.java index 8bb1ac89a77..04b11948c55 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanEnumTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanEnumTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class BooleanEnumTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanSchemaTest.java index 929563b3b6d..8eac335b104 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/BooleanSchemaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class BooleanSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CapitalizationTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CapitalizationTest.java index 34c8bec9944..449b3fc3ed8 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CapitalizationTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CapitalizationTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class CapitalizationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CatTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CatTest.java index c7362bc3b8c..5433d3b52ce 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CatTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CatTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class CatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CategoryTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CategoryTest.java index 94811caf423..fa62430e885 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CategoryTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CategoryTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class CategoryTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ChildCatTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ChildCatTest.java index 9e3a8876816..2ec97e8cbc3 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ChildCatTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ChildCatTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ChildCatTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClassModelTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClassModelTest.java index 686788c0976..8d320225778 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClassModelTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClassModelTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ClassModelTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClientTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClientTest.java index 17d1fc2eae9..1b8625e1600 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClientTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ClientTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ClientTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateralTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateralTest.java index bc424947fa7..8a4ed85a7b1 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateralTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComplexQuadrilateralTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComplexQuadrilateralTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedAnyOfDifferentTypesNoValidationsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedAnyOfDifferentTypesNoValidationsTest.java index 568ded554eb..377879e2d00 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedAnyOfDifferentTypesNoValidationsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedAnyOfDifferentTypesNoValidationsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedAnyOfDifferentTypesNoValidationsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedArrayTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedArrayTest.java index 368c76411c9..320f2eaf9c4 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedArrayTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedArrayTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedArrayTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedBoolTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedBoolTest.java index f10553215a3..90b56a74caa 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedBoolTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedBoolTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedBoolTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNoneTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNoneTest.java index f1dc92b8675..07080d596a6 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNoneTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNoneTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedNoneTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNumberTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNumberTest.java index a178f73c94b..a1d719ccf76 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNumberTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedNumberTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedNumberTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedObjectTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedObjectTest.java index 5487736db3e..8fbee32fe6a 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedObjectTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedObjectTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedObjectTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedOneOfDifferentTypesTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedOneOfDifferentTypesTest.java index e43f646ad25..671d9b17c15 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedOneOfDifferentTypesTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedOneOfDifferentTypesTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedOneOfDifferentTypesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedStringTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedStringTest.java index 9df0f06067e..0d2c79da9ae 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedStringTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ComposedStringTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ComposedStringTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CurrencyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CurrencyTest.java index 05478eb1a25..42b87fca7a2 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CurrencyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/CurrencyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class CurrencyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DanishPigTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DanishPigTest.java index 78867fd2b92..58e85a79ac4 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DanishPigTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DanishPigTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class DanishPigTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeTestTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeTestTest.java index 0ed286b2334..3c60251a500 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeTestTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeTestTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class DateTimeTestTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeWithValidationsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeWithValidationsTest.java index 2d86e3cd630..e3d64ea4f49 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeWithValidationsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeWithValidationsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class DateTimeWithValidationsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateWithValidationsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateWithValidationsTest.java index 5e2eb05c60d..db79cd2c001 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateWithValidationsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DateWithValidationsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class DateWithValidationsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DecimalPayloadTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DecimalPayloadTest.java index 04f2b03b6d1..9109e350071 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DecimalPayloadTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DecimalPayloadTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class DecimalPayloadTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DogTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DogTest.java index 2f4f1b67074..5df062f6422 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DogTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DogTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class DogTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DrawingTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DrawingTest.java index 3691949511a..f87cfd0b4c7 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DrawingTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/DrawingTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class DrawingTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumArraysTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumArraysTest.java index 10739ffb6b7..42c76796a7a 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumArraysTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumArraysTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class EnumArraysTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumClassTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumClassTest.java index 30064749a5c..bad616e00fe 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumClassTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumClassTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class EnumClassTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumTestTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumTestTest.java index 80138ca2f53..6539fe68332 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumTestTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EnumTestTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class EnumTestTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangleTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangleTest.java index bb329c92ad1..5ca85d89e84 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangleTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/EquilateralTriangleTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class EquilateralTriangleTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClassTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClassTest.java index 7c3bcd9f067..a025fd082a5 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClassTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileSchemaTestClassTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class FileSchemaTestClassTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileTest.java index 193fc292247..f1af1767867 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FileTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class FileTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FooTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FooTest.java index ab151f55e8d..7e8eef0b318 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FooTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FooTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class FooTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FormatTestTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FormatTestTest.java index 643ce9e99f5..7b262aa83b1 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FormatTestTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FormatTestTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class FormatTestTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FromSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FromSchemaTest.java index 07860627568..3c3c85bc680 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FromSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FromSchemaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class FromSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitReqTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitReqTest.java index f4aef279702..50684bfeafe 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitReqTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitReqTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class FruitReqTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitTest.java index 016d8c9e6ca..5321c55bfb3 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/FruitTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class FruitTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GmFruitTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GmFruitTest.java index 21618275694..745ad54e584 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GmFruitTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GmFruitTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class GmFruitTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimalTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimalTest.java index 5aed3caaa1a..33db2f523d3 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimalTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/GrandparentAnimalTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class GrandparentAnimalTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnlyTest.java index a7c34d8c81b..b73e2c79657 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnlyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HasOnlyReadOnlyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class HasOnlyReadOnlyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HealthCheckResultTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HealthCheckResultTest.java index f55ee61cbfc..6183f4d7e99 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HealthCheckResultTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/HealthCheckResultTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class HealthCheckResultTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumBigTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumBigTest.java index 6b3c3877830..32eab4d286e 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumBigTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumBigTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class IntegerEnumBigTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumOneValueTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumOneValueTest.java index b771ff9a0b8..5ad579a0627 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumOneValueTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumOneValueTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class IntegerEnumOneValueTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumTest.java index 6e71dce447b..e96a16b1558 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class IntegerEnumTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumWithDefaultValueTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumWithDefaultValueTest.java index 7890963058d..7765b48eba6 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumWithDefaultValueTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerEnumWithDefaultValueTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class IntegerEnumWithDefaultValueTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMax10Test.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMax10Test.java index ac911a266e9..788d36e69ab 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMax10Test.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMax10Test.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class IntegerMax10Test { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMin15Test.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMin15Test.java index f106f94c1b0..8108d4d4f15 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMin15Test.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IntegerMin15Test.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class IntegerMin15Test { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangleTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangleTest.java index 2cad1f35ab2..643cd54912c 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangleTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/IsoscelesTriangleTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class IsoscelesTriangleTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ItemsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ItemsTest.java index 1c0f4d41e81..f529009f5f4 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ItemsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ItemsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ItemsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTestTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTestTest.java index 07f69828d92..82013b05de5 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTestTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestAddReplaceTestTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class JSONPatchRequestAddReplaceTestTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopyTest.java index f8e24829277..920fd7eb85a 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestMoveCopyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class JSONPatchRequestMoveCopyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemoveTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemoveTest.java index 1a22c541de9..932cf8d2932 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemoveTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestRemoveTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class JSONPatchRequestRemoveTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestTest.java index a6476d354a0..69eb1595a8f 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/JSONPatchRequestTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class JSONPatchRequestTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MammalTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MammalTest.java index 6b45e94f8fd..cb127841bc4 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MammalTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MammalTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class MammalTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MapTestTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MapTestTest.java index a4af31328e4..88105c72dbf 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MapTestTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MapTestTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class MapTestTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClassTest.java index 2b694873c0a..1eabdc3b19d 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClassTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MixedPropertiesAndAdditionalPropertiesClassTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class MixedPropertiesAndAdditionalPropertiesClassTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MoneyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MoneyTest.java index d42e9395153..61e44b93121 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MoneyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MoneyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class MoneyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MyObjectDtoTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MyObjectDtoTest.java index a032dc63f91..768525eae33 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MyObjectDtoTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/MyObjectDtoTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class MyObjectDtoTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NameTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NameTest.java index 608e5622136..818954ac663 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NameTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NameTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NameTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NoAdditionalPropertiesTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NoAdditionalPropertiesTest.java index bd1391da049..7c7d68d2412 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NoAdditionalPropertiesTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NoAdditionalPropertiesTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NoAdditionalPropertiesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableClassTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableClassTest.java index 6f66aaccefd..0ed9f5d3b29 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableClassTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableClassTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NullableClassTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableListWithNullableItemsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableListWithNullableItemsTest.java deleted file mode 100644 index 9ef0d471516..00000000000 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableListWithNullableItemsTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.openapijsonschematools.client.components.schemas; - -import org.junit.Assert; -import org.junit.Test; -import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags; -import org.openapijsonschematools.client.configurations.SchemaConfiguration; -import org.openapijsonschematools.client.exceptions.ValidationException; -import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; -import org.checkerframework.checker.nullness.qual.Nullable; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.AbstractMap; - -public class NullableListWithNullableItemsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); -} diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableShapeTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableShapeTest.java index 192a3f53b34..432ba83f13e 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableShapeTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableShapeTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NullableShapeTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableStringTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableStringTest.java index 4df7ff03d83..c335e01c520 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableStringTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NullableStringTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NullableStringTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberOnlyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberOnlyTest.java index e1fd742e03a..c6d38d9f9d2 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberOnlyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberOnlyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NumberOnlyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberSchemaTest.java index b1bf67627c5..41111d393b8 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberSchemaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NumberSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithExclusiveMinMaxTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithExclusiveMinMaxTest.java index b29a6f5ae74..6050f517605 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithExclusiveMinMaxTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithExclusiveMinMaxTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NumberWithExclusiveMinMaxTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithValidationsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithValidationsTest.java index 45f691dde3d..ab2da06c6b8 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithValidationsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/NumberWithValidationsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class NumberWithValidationsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBaseTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBaseTest.java index 7c081e23212..91f7c1dbca3 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBaseTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsBaseTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjWithRequiredPropsBaseTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsTest.java index 33ff9f2295b..99b1ad48084 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjWithRequiredPropsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjWithRequiredPropsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectInterfaceTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectInterfaceTest.java index bf4b4087155..3eb1673e902 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectInterfaceTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectInterfaceTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectInterfaceTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsPropertiesTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsPropertiesTest.java index 2a508833b5a..0f2e63e702f 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsPropertiesTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithArgAndArgsPropertiesTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectModelWithArgAndArgsPropertiesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefPropsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefPropsTest.java index 4b8b16b9bd8..7511bca5225 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefPropsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectModelWithRefPropsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectModelWithRefPropsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddPropTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddPropTest.java index 0e301ee9ca5..a7522f662b5 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddPropTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithAllOfWithReqTestPropFromUnsetAddPropTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithAllOfWithReqTestPropFromUnsetAddPropTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingPropertiesTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingPropertiesTest.java index a86a8fdf755..aa3d568148f 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingPropertiesTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithCollidingPropertiesTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithCollidingPropertiesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalPropertiesTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalPropertiesTest.java index bff4465d83d..4fb561e0f7b 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalPropertiesTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDecimalPropertiesTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithDecimalPropertiesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedPropsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedPropsTest.java index 4dd74670da8..b140cd41e9b 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedPropsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedPropsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithDifficultlyNamedPropsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionPropertyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionPropertyTest.java index bdbb640d8eb..f2458f9cff7 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionPropertyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInlineCompositionPropertyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithInlineCompositionPropertyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedPropertiesTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedPropertiesTest.java index c2adc355f15..5d2b46e68fa 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedPropertiesTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithInvalidNamedRefedPropertiesTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithInvalidNamedRefedPropertiesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValuesTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValuesTest.java index cba8561dbc6..c421fff865e 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValuesTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithNonIntersectingValuesTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithNonIntersectingValuesTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalPropsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalPropsTest.java index 4d4d594d3d0..3449e282dc5 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalPropsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOnlyOptionalPropsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithOnlyOptionalPropsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestPropTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestPropTest.java index 1f1d2013c0f..d2e97475171 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestPropTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithOptionalTestPropTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithOptionalTestPropTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithValidationsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithValidationsTest.java index 2840c0e6f51..5ed0c3cdf38 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithValidationsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ObjectWithValidationsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ObjectWithValidationsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/OrderTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/OrderTest.java index 3310dc511b0..33104c39a46 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/OrderTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/OrderTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class OrderTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDtoTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDtoTest.java index dccf5e2c1e0..b93e652c03f 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDtoTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PaginatedResultMyObjectDtoTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class PaginatedResultMyObjectDtoTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ParentPetTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ParentPetTest.java index c0ebffaa4ba..7049a94acb6 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ParentPetTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ParentPetTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ParentPetTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PetTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PetTest.java index 3f29d792bd9..f4858f16e25 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PetTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PetTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class PetTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PigTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PigTest.java index f7944ab1e76..c95f11161e7 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PigTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PigTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class PigTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PlayerTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PlayerTest.java index 96362c62d04..ce484f82c8f 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PlayerTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PlayerTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class PlayerTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PublicKeyTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PublicKeyTest.java index 3e06c2e8170..e9e37266933 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PublicKeyTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/PublicKeyTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class PublicKeyTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterfaceTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterfaceTest.java index 67e7930f3b7..95ae2e94e4a 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterfaceTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralInterfaceTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class QuadrilateralInterfaceTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralTest.java index 9a16cb361c0..5892af5bc22 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/QuadrilateralTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class QuadrilateralTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirstTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirstTest.java index 88906d339c5..6cb761b4ad2 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirstTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReadOnlyFirstTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ReadOnlyFirstTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefPetTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefPetTest.java index 119fb5cde5a..8cc80a9289e 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefPetTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/RefPetTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class RefPetTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddPropsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddPropsTest.java index 85ccf724d1d..ad3c979fa28 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddPropsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromExplicitAddPropsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ReqPropsFromExplicitAddPropsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddPropsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddPropsTest.java index eb6a6af0033..c3c6dd8cc5c 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddPropsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromTrueAddPropsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ReqPropsFromTrueAddPropsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddPropsTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddPropsTest.java index e556b350f98..c4da9757cf5 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddPropsTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReqPropsFromUnsetAddPropsTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ReqPropsFromUnsetAddPropsTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReturnSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReturnSchemaTest.java index bc1456d43a6..b982061ef58 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReturnSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ReturnSchemaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ReturnSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangleTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangleTest.java index 0cacb982002..eabd899f161 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangleTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ScaleneTriangleTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ScaleneTriangleTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/Schema200ResponseTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/Schema200ResponseTest.java index f05b21c433a..589b4ac0236 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/Schema200ResponseTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/Schema200ResponseTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class Schema200ResponseTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingArrayModelTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingArrayModelTest.java index af04b89d0d1..5451ecf6e18 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingArrayModelTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingArrayModelTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class SelfReferencingArrayModelTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModelTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModelTest.java index c95c4d0bef7..667db9d0191 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModelTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SelfReferencingObjectModelTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class SelfReferencingObjectModelTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeOrNullTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeOrNullTest.java index bc0e53df2b3..ee186963177 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeOrNullTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeOrNullTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ShapeOrNullTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeTest.java index a8927493ecb..93b244c0537 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ShapeTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ShapeTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateralTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateralTest.java index d78110d57c9..a8198711960 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateralTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SimpleQuadrilateralTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class SimpleQuadrilateralTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SomeObjectTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SomeObjectTest.java index ba926b238dd..054d3e1b2e2 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SomeObjectTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SomeObjectTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class SomeObjectTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SpecialModelnameTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SpecialModelnameTest.java index 6bb2e0d6a26..4cc8d82deb0 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SpecialModelnameTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/SpecialModelnameTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class SpecialModelnameTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringBooleanMapTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringBooleanMapTest.java index 137a6c17761..b80f045eb13 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringBooleanMapTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringBooleanMapTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class StringBooleanMapTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumTest.java index d60f135cdbb..62c372bbd94 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class StringEnumTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumWithDefaultValueTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumWithDefaultValueTest.java index 3d62af5eec8..84812e25559 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumWithDefaultValueTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringEnumWithDefaultValueTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class StringEnumWithDefaultValueTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringSchemaTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringSchemaTest.java index 35dcce63d0d..bfed19d6f0a 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringSchemaTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringSchemaTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class StringSchemaTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringWithValidationTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringWithValidationTest.java index 02565f8f541..bc2e9c815be 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringWithValidationTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/StringWithValidationTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class StringWithValidationTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TagTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TagTest.java index 113e8d44065..f5bab27ae3c 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TagTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TagTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class TagTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleInterfaceTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleInterfaceTest.java index 18379a891b8..3945ca06116 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleInterfaceTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleInterfaceTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class TriangleInterfaceTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleTest.java index dfe09d25647..9c82b019410 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/TriangleTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class TriangleTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UUIDStringTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UUIDStringTest.java index 514e181c21a..19b4c1e0146 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UUIDStringTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UUIDStringTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class UUIDStringTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UserTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UserTest.java index f61a8360a04..476ef2aaa8f 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UserTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/UserTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class UserTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/WhaleTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/WhaleTest.java index 4803c4d5b0c..8276f7838da 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/WhaleTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/WhaleTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class WhaleTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ZebraTest.java b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ZebraTest.java index d0b2e68188f..5bed29a10c5 100644 --- a/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ZebraTest.java +++ b/samples/client/petstore/java/src/test/java/org/openapijsonschematools/client/components/schemas/ZebraTest.java @@ -6,7 +6,7 @@ import org.openapijsonschematools.client.configurations.SchemaConfiguration; import org.openapijsonschematools.client.exceptions.ValidationException; import org.openapijsonschematools.client.exceptions.InvalidTypeException; -import org.openapijsonschematools.client.schemas.MapMaker; +import org.openapijsonschematools.client.schemas.validation.MapUtils; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; @@ -15,5 +15,5 @@ import java.util.AbstractMap; public class ZebraTest { - static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()); + static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.onlyFormat()); } diff --git a/samples/client/petstore/python/.openapi-generator/FILES b/samples/client/petstore/python/.openapi-generator/FILES index 00870b8b466..922904e5692 100644 --- a/samples/client/petstore/python/.openapi-generator/FILES +++ b/samples/client/petstore/python/.openapi-generator/FILES @@ -1328,7 +1328,7 @@ src/petstore_api/paths/foo/get/responses/response_default/__init__.py src/petstore_api/paths/foo/get/responses/response_default/content/__init__.py src/petstore_api/paths/foo/get/responses/response_default/content/application_json/__init__.py src/petstore_api/paths/foo/get/responses/response_default/content/application_json/schema.py -src/petstore_api/paths/foo/get/server_s/__init__.py +src/petstore_api/paths/foo/get/servers/__init__.py src/petstore_api/paths/foo/get/servers/server_0.py src/petstore_api/paths/foo/get/servers/server_1.py src/petstore_api/paths/pet/__init__.py @@ -1366,7 +1366,7 @@ src/petstore_api/paths/pet_find_by_status/get/security/__init__.py src/petstore_api/paths/pet_find_by_status/get/security/security_requirement_object_0.py src/petstore_api/paths/pet_find_by_status/get/security/security_requirement_object_1.py src/petstore_api/paths/pet_find_by_status/get/security/security_requirement_object_2.py -src/petstore_api/paths/pet_find_by_status/server_s/__init__.py +src/petstore_api/paths/pet_find_by_status/servers/__init__.py src/petstore_api/paths/pet_find_by_status/servers/server_0.py src/petstore_api/paths/pet_find_by_status/servers/server_1.py src/petstore_api/paths/pet_find_by_tags/__init__.py diff --git a/samples/client/petstore/python/src/petstore_api/components/responses/response_headers_with_no_body/headers.py b/samples/client/petstore/python/src/petstore_api/components/responses/response_headers_with_no_body/headers.py deleted file mode 100644 index c33f609171e..00000000000 --- a/samples/client/petstore/python/src/petstore_api/components/responses/response_headers_with_no_body/headers.py +++ /dev/null @@ -1,105 +0,0 @@ -# coding: utf-8 - -""" - OpenAPI Petstore - This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 - The version of the OpenAPI document: 1.0.0 - Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator -""" - -from __future__ import annotations -from petstore_api.shared_imports.schema_imports import * # pyright: ignore [reportWildcardImportFromLibrary] - -AdditionalProperties: typing_extensions.TypeAlias = schemas.NotAnyTypeSchema - -from petstore_api.components.responses.response_headers_with_no_body.headers.header_location import schema -Properties = typing.TypedDict( - 'Properties', - { - "location": typing.Type[schema.Schema], - } -) - - -class HeadersDict(schemas.immutabledict[str, str]): - - __required_keys__: typing.FrozenSet[str] = frozenset({ - }) - __optional_keys__: typing.FrozenSet[str] = frozenset({ - "location", - }) - - def __new__( - cls, - *, - location: typing.Union[ - str, - schemas.Unset - ] = schemas.unset, - configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None, - ): - arg_: typing.Dict[str, typing.Any] = {} - for key_, val in ( - ("location", location), - ): - if isinstance(val, schemas.Unset): - continue - arg_[key_] = val - used_arg_ = typing.cast(HeadersDictInput, arg_) - return Headers.validate(used_arg_, configuration=configuration_) - - @staticmethod - def from_dict_( - arg: typing.Union[ - HeadersDictInput, - HeadersDict - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return Headers.validate(arg, configuration=configuration) - - @property - def location(self) -> typing.Union[str, schemas.Unset]: - val = self.get("location", schemas.unset) - if isinstance(val, schemas.Unset): - return val - return val -HeadersDictInput = typing.TypedDict( - 'HeadersDictInput', - { - "location": str, - }, - total=False -) - - -@dataclasses.dataclass(frozen=True) -class Headers( - schemas.Schema[HeadersDict, tuple] -): - types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict}) - properties: Properties = dataclasses.field(default_factory=lambda: schemas.typed_dict_to_instance(Properties)) # type: ignore - additional_properties: typing.Type[AdditionalProperties] = dataclasses.field(default_factory=lambda: AdditionalProperties) # type: ignore - type_to_output_cls: typing.Mapping[ - typing.Type, - typing.Type - ] = dataclasses.field( - default_factory=lambda: { - schemas.immutabledict: HeadersDict - } - ) - - @classmethod - def validate( - cls, - arg: typing.Union[ - HeadersDictInput, - HeadersDict, - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return super().validate_base( - arg, - configuration=configuration, - ) - diff --git a/samples/client/petstore/python/src/petstore_api/components/responses/response_success_inline_content_and_header/headers.py b/samples/client/petstore/python/src/petstore_api/components/responses/response_success_inline_content_and_header/headers.py deleted file mode 100644 index c6609a75c7c..00000000000 --- a/samples/client/petstore/python/src/petstore_api/components/responses/response_success_inline_content_and_header/headers.py +++ /dev/null @@ -1,105 +0,0 @@ -# coding: utf-8 - -""" - OpenAPI Petstore - This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 - The version of the OpenAPI document: 1.0.0 - Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator -""" - -from __future__ import annotations -from petstore_api.shared_imports.schema_imports import * # pyright: ignore [reportWildcardImportFromLibrary] - -AdditionalProperties: typing_extensions.TypeAlias = schemas.NotAnyTypeSchema - -from petstore_api.components.responses.response_success_inline_content_and_header.headers.header_some_header import schema -Properties = typing.TypedDict( - 'Properties', - { - "someHeader": typing.Type[schema.Schema], - } -) - - -class HeadersDict(schemas.immutabledict[str, str]): - - __required_keys__: typing.FrozenSet[str] = frozenset({ - }) - __optional_keys__: typing.FrozenSet[str] = frozenset({ - "someHeader", - }) - - def __new__( - cls, - *, - someHeader: typing.Union[ - str, - schemas.Unset - ] = schemas.unset, - configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None, - ): - arg_: typing.Dict[str, typing.Any] = {} - for key_, val in ( - ("someHeader", someHeader), - ): - if isinstance(val, schemas.Unset): - continue - arg_[key_] = val - used_arg_ = typing.cast(HeadersDictInput, arg_) - return Headers.validate(used_arg_, configuration=configuration_) - - @staticmethod - def from_dict_( - arg: typing.Union[ - HeadersDictInput, - HeadersDict - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return Headers.validate(arg, configuration=configuration) - - @property - def someHeader(self) -> typing.Union[str, schemas.Unset]: - val = self.get("someHeader", schemas.unset) - if isinstance(val, schemas.Unset): - return val - return val -HeadersDictInput = typing.TypedDict( - 'HeadersDictInput', - { - "someHeader": str, - }, - total=False -) - - -@dataclasses.dataclass(frozen=True) -class Headers( - schemas.Schema[HeadersDict, tuple] -): - types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict}) - properties: Properties = dataclasses.field(default_factory=lambda: schemas.typed_dict_to_instance(Properties)) # type: ignore - additional_properties: typing.Type[AdditionalProperties] = dataclasses.field(default_factory=lambda: AdditionalProperties) # type: ignore - type_to_output_cls: typing.Mapping[ - typing.Type, - typing.Type - ] = dataclasses.field( - default_factory=lambda: { - schemas.immutabledict: HeadersDict - } - ) - - @classmethod - def validate( - cls, - arg: typing.Union[ - HeadersDictInput, - HeadersDict, - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return super().validate_base( - arg, - configuration=configuration, - ) - diff --git a/samples/client/petstore/python/src/petstore_api/components/responses/response_success_with_json_api_response/headers.py b/samples/client/petstore/python/src/petstore_api/components/responses/response_success_with_json_api_response/headers.py deleted file mode 100644 index a1384cb4341..00000000000 --- a/samples/client/petstore/python/src/petstore_api/components/responses/response_success_with_json_api_response/headers.py +++ /dev/null @@ -1,157 +0,0 @@ -# coding: utf-8 - -""" - OpenAPI Petstore - This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 - The version of the OpenAPI document: 1.0.0 - Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator -""" - -from __future__ import annotations -from petstore_api.shared_imports.schema_imports import * # pyright: ignore [reportWildcardImportFromLibrary] - -AdditionalProperties: typing_extensions.TypeAlias = schemas.NotAnyTypeSchema - -from petstore_api.components.headers.header_int32_json_content_type_header.content.application_json import schema -from petstore_api.components.headers.header_number_header import schema as schema_3 -from petstore_api.components.headers.header_string_header import schema as schema_2 -from petstore_api.components.schema import string_with_validation -Properties = typing.TypedDict( - 'Properties', - { - "ref-schema-header": typing.Type[string_with_validation.StringWithValidation], - "int32": typing.Type[schema.Schema], - "ref-content-schema-header": typing.Type[string_with_validation.StringWithValidation], - "stringHeader": typing.Type[schema_2.Schema], - "numberHeader": typing.Type[schema_3.Schema], - } -) -HeadersRequiredDictInput = typing.TypedDict( - 'HeadersRequiredDictInput', - { - "int32": int, - "ref-content-schema-header": str, - "ref-schema-header": str, - "stringHeader": str, - } -) -HeadersOptionalDictInput = typing.TypedDict( - 'HeadersOptionalDictInput', - { - "numberHeader": str, - }, - total=False -) - - -class HeadersDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]): - - __required_keys__: typing.FrozenSet[str] = frozenset({ - "int32", - "ref-content-schema-header", - "ref-schema-header", - "stringHeader", - }) - __optional_keys__: typing.FrozenSet[str] = frozenset({ - "numberHeader", - }) - - def __new__( - cls, - *, - int32: int, - stringHeader: str, - numberHeader: typing.Union[ - str, - schemas.Unset - ] = schemas.unset, - configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None, - ): - arg_: typing.Dict[str, typing.Any] = { - "int32": int32, - "stringHeader": stringHeader, - } - for key_, val in ( - ("numberHeader", numberHeader), - ): - if isinstance(val, schemas.Unset): - continue - arg_[key_] = val - used_arg_ = typing.cast(HeadersDictInput, arg_) - return Headers.validate(used_arg_, configuration=configuration_) - - @staticmethod - def from_dict_( - arg: typing.Union[ - HeadersDictInput, - HeadersDict - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return Headers.validate(arg, configuration=configuration) - - @property - def int32(self) -> int: - return typing.cast( - int, - self.__getitem__("int32") - ) - - @property - def stringHeader(self) -> str: - return typing.cast( - str, - self.__getitem__("stringHeader") - ) - - @property - def numberHeader(self) -> typing.Union[str, schemas.Unset]: - val = self.get("numberHeader", schemas.unset) - if isinstance(val, schemas.Unset): - return val - return typing.cast( - str, - val - ) - - -class HeadersDictInput(HeadersRequiredDictInput, HeadersOptionalDictInput): - pass - - -@dataclasses.dataclass(frozen=True) -class Headers( - schemas.Schema[HeadersDict, tuple] -): - types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict}) - required: typing.FrozenSet[str] = frozenset({ - "int32", - "ref-content-schema-header", - "ref-schema-header", - "stringHeader", - }) - properties: Properties = dataclasses.field(default_factory=lambda: schemas.typed_dict_to_instance(Properties)) # type: ignore - additional_properties: typing.Type[AdditionalProperties] = dataclasses.field(default_factory=lambda: AdditionalProperties) # type: ignore - type_to_output_cls: typing.Mapping[ - typing.Type, - typing.Type - ] = dataclasses.field( - default_factory=lambda: { - schemas.immutabledict: HeadersDict - } - ) - - @classmethod - def validate( - cls, - arg: typing.Union[ - HeadersDictInput, - HeadersDict, - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return super().validate_base( - arg, - configuration=configuration, - ) - diff --git a/samples/client/petstore/python/src/petstore_api/paths/foo/get/server_s/__init__.py b/samples/client/petstore/python/src/petstore_api/paths/foo/get/server_s/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/samples/client/petstore/python/src/petstore_api/paths/pet_find_by_status/server_s/__init__.py b/samples/client/petstore/python/src/petstore_api/paths/pet_find_by_status/server_s/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/samples/client/petstore/python/src/petstore_api/paths/user_login/get/responses/response_200/headers.py b/samples/client/petstore/python/src/petstore_api/paths/user_login/get/responses/response_200/headers.py deleted file mode 100644 index 4ade69cf757..00000000000 --- a/samples/client/petstore/python/src/petstore_api/paths/user_login/get/responses/response_200/headers.py +++ /dev/null @@ -1,151 +0,0 @@ -# coding: utf-8 - -""" - OpenAPI Petstore - This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 - The version of the OpenAPI document: 1.0.0 - Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator -""" - -from __future__ import annotations -from petstore_api.shared_imports.schema_imports import * # pyright: ignore [reportWildcardImportFromLibrary] - -AdditionalProperties: typing_extensions.TypeAlias = schemas.NotAnyTypeSchema - -from petstore_api.components.headers.header_int32_json_content_type_header.content.application_json import schema as schema_2 -from petstore_api.components.headers.header_number_header import schema as schema_4 -from petstore_api.components.schema import string_with_validation -from petstore_api.paths.user_login.get.responses.response_200.headers.header_x_expires_after import schema as schema_3 -from petstore_api.paths.user_login.get.responses.response_200.headers.header_x_rate_limit.content.application_json import schema -Properties = typing.TypedDict( - 'Properties', - { - "X-Rate-Limit": typing.Type[schema.Schema], - "int32": typing.Type[schema_2.Schema], - "X-Expires-After": typing.Type[schema_3.Schema], - "ref-content-schema-header": typing.Type[string_with_validation.StringWithValidation], - "numberHeader": typing.Type[schema_4.Schema], - } -) -HeadersRequiredDictInput = typing.TypedDict( - 'HeadersRequiredDictInput', - { - "X-Rate-Limit": int, - "int32": int, - "ref-content-schema-header": str, - } -) -HeadersOptionalDictInput = typing.TypedDict( - 'HeadersOptionalDictInput', - { - "X-Expires-After": typing.Union[ - str, - datetime.datetime - ], - "numberHeader": str, - }, - total=False -) - - -class HeadersDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]): - - __required_keys__: typing.FrozenSet[str] = frozenset({ - "X-Rate-Limit", - "int32", - "ref-content-schema-header", - }) - __optional_keys__: typing.FrozenSet[str] = frozenset({ - "X-Expires-After", - "numberHeader", - }) - - def __new__( - cls, - *, - int32: int, - numberHeader: typing.Union[ - str, - schemas.Unset - ] = schemas.unset, - configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None, - ): - arg_: typing.Dict[str, typing.Any] = { - "int32": int32, - } - for key_, val in ( - ("numberHeader", numberHeader), - ): - if isinstance(val, schemas.Unset): - continue - arg_[key_] = val - used_arg_ = typing.cast(HeadersDictInput, arg_) - return Headers.validate(used_arg_, configuration=configuration_) - - @staticmethod - def from_dict_( - arg: typing.Union[ - HeadersDictInput, - HeadersDict - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return Headers.validate(arg, configuration=configuration) - - @property - def int32(self) -> int: - return typing.cast( - int, - self.__getitem__("int32") - ) - - @property - def numberHeader(self) -> typing.Union[str, schemas.Unset]: - val = self.get("numberHeader", schemas.unset) - if isinstance(val, schemas.Unset): - return val - return typing.cast( - str, - val - ) - - -class HeadersDictInput(HeadersRequiredDictInput, HeadersOptionalDictInput): - pass - - -@dataclasses.dataclass(frozen=True) -class Headers( - schemas.Schema[HeadersDict, tuple] -): - types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict}) - required: typing.FrozenSet[str] = frozenset({ - "X-Rate-Limit", - "int32", - "ref-content-schema-header", - }) - properties: Properties = dataclasses.field(default_factory=lambda: schemas.typed_dict_to_instance(Properties)) # type: ignore - additional_properties: typing.Type[AdditionalProperties] = dataclasses.field(default_factory=lambda: AdditionalProperties) # type: ignore - type_to_output_cls: typing.Mapping[ - typing.Type, - typing.Type - ] = dataclasses.field( - default_factory=lambda: { - schemas.immutabledict: HeadersDict - } - ) - - @classmethod - def validate( - cls, - arg: typing.Union[ - HeadersDictInput, - HeadersDict, - ], - configuration: typing.Optional[schema_configuration.SchemaConfiguration] = None - ) -> HeadersDict: - return super().validate_base( - arg, - configuration=configuration, - ) - diff --git a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index 0aa2aadc00a..4c0e0941dc2 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java +++ b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -48,10 +48,10 @@ import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; -import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; -import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenText; import org.openapijsonschematools.codegen.templating.DryRunTemplateManager; @@ -418,7 +418,7 @@ private void generateFiles(List> processTemplateToFileInfos, boolea } } - private void generatePathItem(List files, CodegenKey pathKey, CodegenPathItem pathItem, String jsonPath, List servers, List> security) { + private void generatePathItem(List files, CodegenKey pathKey, CodegenPathItem pathItem, String jsonPath, List servers, List security) { Map pathTemplateInfo = new HashMap<>(); pathTemplateInfo.put("pathModule", pathKey.snakeCase); pathTemplateInfo.put("apiClassName", pathKey.pascalCase); @@ -538,7 +538,7 @@ private void generatePathItem(List files, CodegenKey pathKey, CodegenPathI } } - private void generatePaths(List files, TreeMap paths, List servers, List> security) { + private void generatePaths(List files, TreeMap paths, CodegenList servers, List security) { if (paths == null || paths.isEmpty()) { LOGGER.info("Skipping generation of paths because the specification document lacks them."); return; @@ -1317,20 +1317,24 @@ Map buildSupportFileBundle( TreeMap headers, TreeMap parameters, TreeMap securitySchemes, - CodegenServers servers, + CodegenList servers, TreeMap paths, - List> security) { + CodegenList security) { Map bundle = new HashMap<>(generator.additionalProperties()); bundle.put("apiPackage", generator.apiPackage()); URL url = URLPathUtils.getServerURL(openAPI, null); - List allServers = new ArrayList<>(); + List> allServers = new ArrayList<>(); + List> allSecurity = new ArrayList<>(); boolean hasServers = false; if (servers != null) { allServers.add(servers); hasServers = true; } + if (security != null) { + allSecurity.add(security); + } if (paths != null) { for (CodegenPathItem pathItem: paths.values()) { if (pathItem.servers != null) { @@ -1343,6 +1347,9 @@ Map buildSupportFileBundle( allServers.add(operation.servers); hasServers = true; } + if (operation.security != null) { + allSecurity.add(operation.security); + } } } } @@ -1350,6 +1357,7 @@ Map buildSupportFileBundle( bundle.put("openAPI", openAPI); bundle.put("allServers", allServers); + bundle.put("allSecurity", allSecurity); bundle.put("scheme", URLPathUtils.getScheme(url, generator)); bundle.put("contextPath", contextPath); bundle.put("requestBodies", requestBodies); @@ -1389,7 +1397,7 @@ Map buildSupportFileBundle( return bundle; } - private void generateServers(List files, List servers, String jsonPath) { + private void generateServers(List files, CodegenList servers, String jsonPath) { if (servers == null && servers.isEmpty()) { return; } @@ -1436,7 +1444,7 @@ private TreeMap getTags() { return tags; } - private void generateSecurity(List files, List> security, String jsonPath) { + private void generateSecurity(List files, CodegenList security, String jsonPath) { if (security == null || security.isEmpty()) { return; } @@ -1444,15 +1452,18 @@ private void generateSecurity(List files, List securityTemplateData = new HashMap<>(); + securityTemplateData.put("packageName", generator.packageName()); + securityTemplateData.put("security", security); + generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITIES, CodegenConstants.SECURITY, securityTemplateData, true); int i = 0; - for (HashMap securityRequirementObject: security) { + for (CodegenSecurityRequirementObject securityRequirementObject: security) { Map templateData = new HashMap<>(); templateData.put("packageName", generator.packageName()); templateData.put("securityRequirementObject", securityRequirementObject); - String serverJsonPath = jsonPath + "/" + i; - generateXs(files, serverJsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY, CodegenConstants.SECURITY, templateData, true); + String securityJsonPath = jsonPath + "/" + i; + generateXs(files, securityJsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY, CodegenConstants.SECURITY, templateData, true); i++; } } @@ -1507,7 +1518,7 @@ public List generate() { // components.securitySchemes TreeMap securitySchemes = generateSecuritySchemes(files); // security - List> security = generator.fromSecurity(openAPI.getSecurity(), "#/security"); + CodegenList security = generator.fromSecurity(openAPI.getSecurity(), "#/security"); generateSecurity(files, security, "#/security"); boolean schemasExist = (schemas != null && !schemas.isEmpty()); @@ -1521,7 +1532,7 @@ public List generate() { // servers String serversJsonPath = "#/servers"; - CodegenServers servers = generator.fromServers(openAPI.getServers(), serversJsonPath); + CodegenList servers = generator.fromServers(openAPI.getServers(), serversJsonPath); // paths TreeMap paths = generator.fromPaths(openAPI.getPaths()); generatePaths(files, paths, servers, security); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index b721f41682f..9273ada54c1 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -65,10 +65,11 @@ import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; -import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenText; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenXml; @@ -939,7 +940,7 @@ public String toServerFilename(String basename, String jsonPath) { } @Override - public String toSecurityRequirementObjectFilename(String basename, String jsonPath) { + public String toSecurityFilename(String basename, String jsonPath) { return toModuleFilename(basename, jsonPath); } @@ -2572,7 +2573,7 @@ public CodegenSchema fromSchema(Schema p, String sourceJsonPath, String currentJ return property; } - protected List getMapBuilders(CodegenSchema schema, String currentJsonPath, String sourceJsonPath) { + protected List> getMapBuilders(CodegenSchema schema, String currentJsonPath, String sourceJsonPath) { return null; } @@ -2675,10 +2676,10 @@ public CodegenOperation fromOperation(Operation operation, String jsonPath, Link CodegenKey operationId = getOperationId(operation, path, httpMethod); // servers setting - CodegenServers codegenServers = null; + CodegenList codegenList = null; if (operation.getServers() != null && !operation.getServers().isEmpty()) { // use operation-level servers first if defined - codegenServers = fromServers(operation.getServers(), jsonPath + "/servers"); + codegenList = fromServers(operation.getServers(), jsonPath + "/servers"); } CodegenText summary = null; @@ -2923,7 +2924,7 @@ public CodegenOperation fromOperation(Operation operation, String jsonPath, Link } } } - List> security = fromSecurity(operation.getSecurity(), jsonPath + "/security"); + CodegenList security = fromSecurity(operation.getSecurity(), jsonPath + "/security"); ExternalDocumentation externalDocs = operation.getExternalDocs(); CodegenKey jsonPathPiece = getKey(pathPieces[pathPieces.length-1], "verb"); CodegenSchema pathParametersSchema = getXParametersSchema(pathParametersProperties, pathParametersRequired, jsonPath + "/" + "PathParameters", jsonPath + "/" + "PathParameters"); @@ -2940,7 +2941,7 @@ public CodegenOperation fromOperation(Operation operation, String jsonPath, Link summary, description, produces, - codegenServers, + codegenList, requestBody, operationParameters, pathParametersSchema, @@ -2980,18 +2981,43 @@ private CodegenSchema getXParametersSchema(HashMap xParametersPr } @Override - public List> fromSecurity(List security, String jsonPath) { + public CodegenList fromSecurity(List security, String jsonPath) { if (security == null) { return null; } - List> securityRequirements = new ArrayList<>(); + List items = new ArrayList<>(); int i = 0; for (SecurityRequirement specSecurityRequirement: security) { - HashMap securityRequirement = fromSecurityRequirement(specSecurityRequirement, jsonPath+ "/" + i); - securityRequirements.add(securityRequirement); + TreeSet imports = new TreeSet<>(); + HashMap map = fromSecurityRequirement(specSecurityRequirement, jsonPath+ "/" + i); + for (CodegenSecurityRequirementValue val: map.values()) { + imports.addAll(val.imports); + } + String securityJsonPathPiece = jsonPath + "/" + i; + String subpackage = getSubpackage(securityJsonPathPiece); + CodegenKey key = getKey(String.valueOf(i), "security", securityJsonPathPiece); + var securityRequirementObject = new CodegenSecurityRequirementObject( + imports, + map, + subpackage, + key + ); + items.add(securityRequirementObject); i++; } - return securityRequirements; + CodegenKey jsonPathPiece = getKey("", "security", jsonPath); + String subpackage = getSubpackage(jsonPath); + List> builders = getSecurityBuilders(items, jsonPath); + return new CodegenList<>( + items, + jsonPathPiece, + subpackage, + builders + ); + } + + protected List> getSecurityBuilders(List items, String jsonPath) { + return null; } private String responsePathFromDocRoot(String sourceJsonPath) { @@ -3853,7 +3879,7 @@ private void updatePathsFilepath(String[] pathPieces) { } else if (pathPieces[4].equals("servers")) { if (pathPieces.length == 5) { // #/paths/somePath/get/servers - pathPieces[4] = toServerFilename("s", jsonPath); + pathPieces[4] = toServerFilename("servers", jsonPath); } else if (pathPieces.length == 6) { // #/paths/somePath/get/servers/0 pathPieces[5] = toServerFilename(pathPieces[5], jsonPath); @@ -3862,9 +3888,15 @@ private void updatePathsFilepath(String[] pathPieces) { pathPieces[5] = "server" + pathPieces[5]; pathPieces[6] = "Variables"; } - } else if (pathPieces[4].equals("security") && pathPieces.length > 5) { - // #/paths/somePath/get/security/0 - pathPieces[5] = toSecurityRequirementObjectFilename(pathPieces[5], null); + } else if (pathPieces[4].equals("security")) { + // #/paths/somePath/get/security + if (pathPieces.length == 5) { + pathPieces[4] = toSecurityFilename("security", jsonPath); + } else { + // #/paths/somePath/get/security/0 + pathPieces[5] = toSecurityFilename(pathPieces[5], jsonPath); + } + return; } else if (pathPieces[4].equals("responses")) { if (pathPieces.length < 6) { // #/paths/user_login/get/responses -> length 5 @@ -3937,24 +3969,28 @@ private void updatePathsFilepath(String[] pathPieces) { } protected void updateServersFilepath(String[] pathPieces) { + String jsonPath = String.join("/", pathPieces); if (pathPieces.length == 2) { // #/servers } else if (pathPieces.length == 3) { // #/servers/0 - String jsonPath = "#/servers/" + pathPieces[2]; pathPieces[2] = toServerFilename(pathPieces[2], jsonPath); } else { // #/servers/0/variables - pathPieces[2] = toServerFilename(pathPieces[2], null).toLowerCase(Locale.ROOT); + pathPieces[2] = toServerFilename(pathPieces[2], jsonPath).toLowerCase(Locale.ROOT); pathPieces[3] = "Variables"; } } private void updateSecurityFilepath(String[] pathPieces) { + String jsonPath = String.join("/", pathPieces); if (pathPieces.length < 3) { + // #/security + pathPieces[1] = toSecurityFilename("security", jsonPath); return; } - pathPieces[2] = toSecurityRequirementObjectFilename(pathPieces[2], null); + // #/security/0 + pathPieces[2] = toSecurityFilename(pathPieces[2], jsonPath); } private void updateApisFilepath(String[] pathPieces) { @@ -4868,6 +4904,15 @@ public CodegenKey getKey(String key, String keyType, String sourceJsonPath) { pascalCaseName = getPascalCaseServer(usedKey, sourceJsonPath); camelCaseName = camelize(pascalCaseName, true); break; + case "security": + // #/security + + // #/security/0 + usedKey = escapeUnsafeCharacters(key); + isValid = isValid(usedKey); + snakeCaseName = toSecuritySnakeCase(key, sourceJsonPath); + pascalCaseName = toSecurityPascalCase(key, sourceJsonPath); + camelCaseName = camelize(pascalCaseName, true); + break; } if (pascalCaseName != null) { kebabCase = pascalCaseName.toLowerCase(Locale.ROOT); @@ -4882,6 +4927,14 @@ public CodegenKey getKey(String key, String keyType, String sourceJsonPath) { ); } + protected String toSecurityPascalCase(String basename, String jsonPath) { + return toSecurityFilename(basename, jsonPath); + } + + protected String toSecuritySnakeCase(String basename, String jsonPath) { + return "security_"+basename; + } + protected LinkedHashMapWithContext getRequiredProperties(LinkedHashSet required, LinkedHashMap properties, CodegenSchema additionalProperties, HashMap requiredAndOptionalProperties, String sourceJsonPath, Map schemaProperties, String currentName) { if (required.isEmpty()) { return null; @@ -5061,7 +5114,7 @@ public CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath) { // sort them operations = new TreeMap<>(operations); List specServers = pathItem.getServers(); - CodegenServers servers = fromServers(specServers, jsonPath + "/servers"); + CodegenList servers = fromServers(specServers, jsonPath + "/servers"); return new CodegenPathItem( summary, @@ -5073,7 +5126,7 @@ public CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath) { } @Override - public CodegenServers fromServers(List servers, String jsonPath) { + public CodegenList fromServers(List servers, String jsonPath) { if (servers == null) { return null; } @@ -5095,12 +5148,13 @@ public CodegenServers fromServers(List servers, String jsonPath) { ); codegenServers.add(cs); } - CodegenKey jsonPathPiece = getKey("s", "servers", jsonPath); + CodegenKey jsonPathPiece = getKey("servers", "servers", jsonPath); String serversSubpackage = getSubpackage(jsonPath); - return new CodegenServers( + return new CodegenList<>( codegenServers, jsonPathPiece, - serversSubpackage + serversSubpackage, + null ); } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 68a47d42177..701d2162496 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -36,9 +36,10 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.models.VendorExtension; -import org.openapijsonschematools.codegen.generators.openapimodels.ArrayListWithContext; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRefInfo; -import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; @@ -52,7 +53,6 @@ import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; -import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; @@ -145,7 +145,7 @@ public interface Generator { CodegenTag fromTag(String name, String description); - List> fromSecurity(List security, String jsonPath); + CodegenList fromSecurity(List security, String jsonPath); CodegenOperation fromOperation(Operation operation, String jsonPath, LinkedHashMap, CodegenParameter> pathItemParameters); @@ -159,7 +159,7 @@ public interface Generator { CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath); - CodegenServers fromServers(List servers, String jsonPath); + CodegenList fromServers(List servers, String jsonPath); CodegenSchema fromServerVariables(Map variables, String jsonPath); @@ -197,7 +197,7 @@ public interface Generator { String toServerFilename(String baseName, String jsonPath); - String toSecurityRequirementObjectFilename(String baseName, String jsonPath); + String toSecurityFilename(String baseName, String jsonPath); String getPascalCaseServer(String baseName, String jsonPath); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 5e4cd6b7c23..b56367f29f3 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -32,6 +32,7 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.OperationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; @@ -44,6 +45,7 @@ import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; import org.openapijsonschematools.codegen.generators.openapimodels.EnumInfo; import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue; @@ -275,11 +277,13 @@ public JavaClientGenerator() { .includeDocumentationFeatures( DocumentationFeature.Readme, DocumentationFeature.Servers, - DocumentationFeature.ComponentSchemas + DocumentationFeature.ComponentSchemas, + DocumentationFeature.ComponentSecuritySchemes ) .includeGlobalFeatures( GlobalFeature.Components, - GlobalFeature.Servers + GlobalFeature.Servers, + GlobalFeature.Security ) .includeComponentsFeatures( ComponentsFeature.schemas, @@ -290,6 +294,10 @@ public JavaClientGenerator() { SecurityFeature.HTTP_Basic, SecurityFeature.HTTP_Bearer ) + .includeOperationFeatures( + OperationFeature.Security, + OperationFeature.Servers + ) .includeSchemaFeatures( SchemaFeature.AdditionalProperties, SchemaFeature.AllOf, @@ -549,13 +557,13 @@ public void processOpts() { additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName); List schemaSupportingFiles = new ArrayList<>(); schemaSupportingFiles.add("AnyTypeJsonSchema"); - schemaSupportingFiles.add("BaseBuilder"); schemaSupportingFiles.add("BooleanJsonSchema"); schemaSupportingFiles.add("DateJsonSchema"); schemaSupportingFiles.add("DateTimeJsonSchema"); schemaSupportingFiles.add("DecimalJsonSchema"); schemaSupportingFiles.add("DoubleJsonSchema"); schemaSupportingFiles.add("FloatJsonSchema"); + schemaSupportingFiles.add("GenericBuilder"); schemaSupportingFiles.add("Int32JsonSchema"); schemaSupportingFiles.add("Int64JsonSchema"); schemaSupportingFiles.add("IntJsonSchema"); @@ -1517,7 +1525,7 @@ private void addPropertiesImports(CodegenSchema schema, Set imports) { imports.add("import java.util.Map;"); imports.add("import java.util.Set;"); imports.add("import " + packageName + ".exceptions.UnsetPropertyException;"); - imports.add("import " + packageName + ".schemas.BaseBuilder;"); + imports.add("import " + packageName + ".schemas.GenericBuilder;"); } } @@ -1568,7 +1576,7 @@ private void addAdditionalPropertiesImports(CodegenSchema schema, Set im imports.add("import "+packageName + ".exceptions.InvalidAdditionalPropertyException;"); } if (schema.additionalProperties != null) { - imports.add("import "+packageName + ".schemas.BaseBuilder;"); + imports.add("import "+packageName + ".schemas.GenericBuilder;"); imports.add("import "+packageName + ".schemas.validation.MapUtils;"); } else { imports.add("import "+packageName + ".schemas.UnsetAddPropsSetter;"); @@ -1579,7 +1587,7 @@ private void addAdditionalPropertiesImports(CodegenSchema schema, Set im private void addRequiredValidator(CodegenSchema schema, Set imports) { if (schema.requiredProperties != null) { imports.add("import java.util.Set;"); - imports.add("import "+packageName + ".schemas.BaseBuilder;"); + imports.add("import "+packageName + ".schemas.GenericBuilder;"); } } @@ -2001,8 +2009,8 @@ private void addDoubleEnum(LinkedHashMap getMapBuilders(CodegenSchema schema, String currentJsonPath, String sourceJsonPath) { - List builders = new ArrayList<>(); + protected List> getMapBuilders(CodegenSchema schema, String currentJsonPath, String sourceJsonPath) { + List> builders = new ArrayList<>(); if (sourceJsonPath == null) { return builders; } @@ -2014,12 +2022,12 @@ protected List getMapBuilders(CodegenSchema schema, String currentJs qtyBuilders = (int) Math.pow(2, schema.requiredProperties.size()); reqPropsSize = schema.requiredProperties.size(); } - Map bitStrToBuilder = new HashMap<>(); + Map> bitStrToBuilder = new HashMap<>(); List reqPropKeys = new ArrayList<>(); if (schema.requiredProperties != null) { reqPropKeys.addAll(schema.requiredProperties.keySet()); } - MapBuilder lastBuilder = null; + MapBuilder lastBuilder = null; // builders are built last to first, last builder has build method for (int i=0; i < qtyBuilders; i++) { String bitStr = ""; @@ -2037,12 +2045,12 @@ protected List getMapBuilders(CodegenSchema schema, String currentJs } else { builderClassName = getKey(schemaName + objectIOClassNamePiece + bitStr + "Builder", "schemas", sourceJsonPath); } - MapBuilder builder; + MapBuilder builder; if (i == 0) { - builder = new MapBuilder(builderClassName, new LinkedHashMap<>()); + builder = new MapBuilder<>(builderClassName, new LinkedHashMap<>()); lastBuilder = builder; } else { - LinkedHashMap keyToBuilder = new LinkedHashMap<>(); + LinkedHashMap> keyToBuilder = new LinkedHashMap<>(); for (int c=0; c < reqPropsSize; c++) { if (bitStr.charAt(c) == '1') { StringBuilder nextBuilderBitStr = new StringBuilder(bitStr); @@ -2051,22 +2059,22 @@ protected List getMapBuilders(CodegenSchema schema, String currentJs if (key == null) { throw new RuntimeException("key must exist at c="+c); } - MapBuilder nextBuilder = bitStrToBuilder.get(nextBuilderBitStr.toString()); + MapBuilder nextBuilder = bitStrToBuilder.get(nextBuilderBitStr.toString()); if (nextBuilder == null) { throw new RuntimeException("Next builder must exist for bitStr="+ nextBuilderBitStr); } - var pair = new MapBuilder.BuilderSchemaPair(nextBuilder, schema.requiredProperties.get(key)); + var pair = new MapBuilder.BuilderPropertyPair<>(nextBuilder, schema.requiredProperties.get(key)); keyToBuilder.put(key, pair); } } - builder = new MapBuilder(builderClassName, keyToBuilder); + builder = new MapBuilder<>(builderClassName, keyToBuilder); } bitStrToBuilder.put(bitStr, builder); builders.add(builder); } if (lastBuilder != null && schema.optionalProperties != null) { for (Map.Entry entry: schema.optionalProperties.entrySet()) { - var pair = new MapBuilder.BuilderSchemaPair(lastBuilder, entry.getValue()); + var pair = new MapBuilder.BuilderPropertyPair<>(lastBuilder, entry.getValue()); lastBuilder.keyToBuilder.put(entry.getKey(), pair); } } @@ -2373,18 +2381,34 @@ public void setOpenAPI(OpenAPI openAPI) { super.setOpenAPI(openAPI); Components components = openAPI.getComponents(); if (components != null && components.getSecuritySchemes() != null) { + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs", + packagePath() + File.separatorChar + "securityrequirementobjects", + "SecurityRequirementObject.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/securityrequirementobjects/EmptySecurityRequirementObject.hbs", + packagePath() + File.separatorChar + "securityrequirementobjects", + "EmptySecurityRequirementObject.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectProvider.hbs", + packagePath() + File.separatorChar + "securityrequirementobjects", + "SecurityRequirementObjectProvider.java")); supportingFiles.add(new SupportingFile( "src/main/java/packagename/securityschemes/SecurityScheme.hbs", packagePath() + File.separatorChar + "securityschemes", "SecurityScheme.java")); supportingFiles.add(new SupportingFile( - "src/main/java/packagename/securityschemes/ApiKeyInLocation.hbs", + "src/main/java/packagename/securityschemes/ApiKeyCookieSecurityScheme.hbs", packagePath() + File.separatorChar + "securityschemes", - "ApiKeyInLocation.java")); + "ApiKeyCookieSecurityScheme.java")); supportingFiles.add(new SupportingFile( - "src/main/java/packagename/securityschemes/ApiKeySecurityScheme.hbs", + "src/main/java/packagename/securityschemes/ApiKeyHeaderSecurityScheme.hbs", packagePath() + File.separatorChar + "securityschemes", - "ApiKeySecurityScheme.java")); + "ApiKeyHeaderSecurityScheme.java")); + supportingFiles.add(new SupportingFile( + "src/main/java/packagename/securityschemes/ApiKeyQuerySecurityScheme.hbs", + packagePath() + File.separatorChar + "securityschemes", + "ApiKeyQuerySecurityScheme.java")); supportingFiles.add(new SupportingFile( "src/main/java/packagename/securityschemes/HttpBasicSecurityScheme.hbs", packagePath() + File.separatorChar + "securityschemes", @@ -2414,6 +2438,18 @@ public void setOpenAPI(OpenAPI openAPI) { packagePath() + File.separatorChar + "securityschemes", "OpenIdConnectSecurityScheme.java")); + jsonPathTemplateFiles.put( + CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY, + new HashMap<>() {{ + put("src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs", ".java"); + }} + ); + jsonPathTemplateFiles.put( + CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITIES, + new HashMap<>() {{ + put("src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs", ".java"); + }} + ); jsonPathTemplateFiles.put( CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY_SCHEME, new HashMap<>() {{ @@ -2468,6 +2504,115 @@ public void setOpenAPI(OpenAPI openAPI) { } } + protected List> getSecurityBuilders(List items, String jsonPath) { + List> builders = new ArrayList<>(); + if (items.isEmpty()) { + return null; + } + String schemaName = "Securities"; + int qtyBuilders = items.size()+1; + int reqPropsSize = items.size(); + Map> bitStrToBuilder = new HashMap<>(); + List reqPropKeys = new ArrayList<>(); + for (int i=0; i < items.size(); i ++) { + reqPropKeys.add(items.get(i).jsonPathPiece); + } + // builders are built last to first, last builder has build method + /* + 2 -> 3 builders + 2**0 -> 1 10 + 2**1 -> 2 01 + 2**2 -> 4 11 + + 3 -> 4 + 111 7 + 110 6 + 101 5 + 011 3 + + 1 -> 2 builders + 1 + 0 + */ + for (int i=0; i < qtyBuilders; i++) { + String lastBuilderBitStr = "1".repeat(reqPropsSize); + String bitStr; + if (i == qtyBuilders-1) { + bitStr = lastBuilderBitStr; + } else { + bitStr = lastBuilderBitStr.substring(0, i) + "0" + + lastBuilderBitStr.substring(i + 1); + } + CodegenKey builderClassName; + if (i == qtyBuilders - 1) { + // first invoked builder has the simplest name with no bitStr + builderClassName = getKey(schemaName + "Builder", "schemas", jsonPath); + } else { + builderClassName = getKey(schemaName + bitStr + "Builder", "schemas", jsonPath); + } + MapBuilder builder; + if (i != qtyBuilders-1) { + // final optional builders + LinkedHashMap> keyToBuilder = new LinkedHashMap<>(); + builder = new MapBuilder<>(builderClassName, keyToBuilder); + for (int c=0; c < reqPropsSize; c++) { + if (bitStr.charAt(c) == '1') { + CodegenKey key = reqPropKeys.get(c); + if (key == null) { + throw new RuntimeException("key must exist at c="+c); + } + var pair = new MapBuilder.BuilderPropertyPair<>(builder, items.get(c)); + keyToBuilder.put(key, pair); + } + } + } else { + // first builder with required props + LinkedHashMap> keyToBuilder = new LinkedHashMap<>(); + for (int c=0; c < reqPropsSize; c++) { + if (bitStr.charAt(c) == '1') { + StringBuilder nextBuilderBitStr = new StringBuilder(bitStr); + nextBuilderBitStr.setCharAt(c, '0'); + CodegenKey key = reqPropKeys.get(c); + if (key == null) { + throw new RuntimeException("key must exist at c="+c); + } + MapBuilder nextBuilder = bitStrToBuilder.get(nextBuilderBitStr.toString()); + if (nextBuilder == null) { + throw new RuntimeException("Next builder must exist for bitStr="+ nextBuilderBitStr); + } + var pair = new MapBuilder.BuilderPropertyPair<>(nextBuilder, items.get(c)); + keyToBuilder.put(key, pair); + } + } + builder = new MapBuilder<>(builderClassName, keyToBuilder); + } + bitStrToBuilder.put(bitStr, builder); + builders.add(builder); + } + return builders; + } + + @Override + public String toSecurityFilename(String basename, String jsonPath) { + String[] pathPieces = jsonPath.split("/"); + if (pathPieces.length == 2) { + // #/security + return "SecurityInfo"; + } else if (pathPieces.length == 3) { + // #/security/0 + return "SecurityRequirementObject"+pathPieces[pathPieces.length-1]; + } else if (pathPieces.length == 5) { + // #/paths/somePath/verb/security + CodegenKey pathKey = getKey(ModelUtils.decodeSlashes(pathPieces[2]), "paths"); + return pathKey.pascalCase + StringUtils.capitalize(pathPieces[3]) + "SecurityInfo"; + } else if (pathPieces.length == 6) { + // #/paths/somePath/verb/security/0 + CodegenKey pathKey = getKey(ModelUtils.decodeSlashes(pathPieces[2]), "paths"); + return pathKey.pascalCase + StringUtils.capitalize(pathPieces[3]) + "SecurityRequirementObject"+pathPieces[pathPieces.length-1]; + } + return null; + } + @Override public void preprocessOpenAPI(OpenAPI openAPI) { super.preprocessOpenAPI(openAPI); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index c66497cd6e5..58755653b31 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -288,7 +288,9 @@ public PythonClientGenerator() { OperationFeature.Responses_Default, OperationFeature.Responses_HttpStatusCode, OperationFeature.Responses_RangedResponseCodes, - OperationFeature.Responses_RedirectionResponse + OperationFeature.Responses_RedirectionResponse, + OperationFeature.Security, + OperationFeature.Servers ) ); @@ -824,6 +826,10 @@ public String toModuleFilename(String name, String jsonPath) { return underscore(dropDots(toModelName(name, jsonPath))); } + protected String toSecurityPascalCase(String basename, String jsonPath) { + return "Security"; + } + @Override public String toContentTypeFilename(String name) { return toModuleFilename(name, null); @@ -1846,11 +1852,17 @@ public String toSecuritySchemeFilename(String basename, String jsonPath) { @Override public String toServerFilename(String basename, String jsonPath) { + if (jsonPath.endsWith("/servers")) { + return "servers"; + } return "server_" + basename; } @Override - public String toSecurityRequirementObjectFilename(String basename, String jsonPath) { + public String toSecurityFilename(String basename, String jsonPath) { + if (jsonPath.endsWith("/security")) { + return "security"; + } return "security_requirement_object_" + basename; } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java index a100566767f..84193473296 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java @@ -16,6 +16,7 @@ package org.openapijsonschematools.codegen.generators.generatormetadata.features; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; /** @@ -33,4 +34,10 @@ public enum OperationFeature { @OAS3 Responses_RedirectionResponse, + + @OAS2 @OAS3 + Security, + + @OAS3 + Servers, } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServers.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenList.java similarity index 50% rename from src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServers.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenList.java index b510d25c00f..1cc7f029abe 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServers.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenList.java @@ -1,30 +1,31 @@ package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.AbstractList; -import java.util.Iterator; import java.util.List; /** * A class to store inline codegenschema definitions */ -public class CodegenServers extends AbstractList { - public final List servers; +public class CodegenList extends AbstractList { + public final List items; public final CodegenKey jsonPathPiece; public final String subpackage; + public final List> builders; - public CodegenServers(List servers, CodegenKey jsonPathPiece, String subpackage) { - this.servers = servers; + public CodegenList(List items, CodegenKey jsonPathPiece, String subpackage, List> builders) { + this.items = items; this.jsonPathPiece = jsonPathPiece; this.subpackage = subpackage; + this.builders = builders; } @Override - public CodegenServer get(int index) { - return this.servers.get(index); + public T get(int index) { + return this.items.get(index); } @Override public int size() { - return this.servers.size(); + return this.items.size(); } } diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java index 28c9d7b446e..c5911b3bd2f 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java @@ -18,7 +18,6 @@ package org.openapijsonschematools.codegen.generators.openapimodels; import io.swagger.v3.oas.models.ExternalDocumentation; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.*; @@ -30,7 +29,7 @@ public class CodegenOperation { public final LinkedHashSet errorWildcardStatusCodes; // values like 4 for 4XX public final CodegenText summary, description; public final LinkedHashSet produces; - public final CodegenServers servers; + public final CodegenList servers; public final CodegenRequestBody requestBody; // properties where key is contentType, value is a ref schema, encapsulates imports public final CodegenSchema requestBodySchema; @@ -43,7 +42,7 @@ public class CodegenOperation { public final boolean hasRequiredParamOrBody; public final boolean hasOptionalParamOrBody; - public final List> security; + public final CodegenList security; public final Map tags; public final TreeMap responses; public final TreeMap statusCodeResponses; @@ -65,7 +64,7 @@ public CodegenOperation( CodegenText summary, CodegenText description, LinkedHashSet produces, - CodegenServers servers, + CodegenList servers, CodegenRequestBody requestBody, ParameterCollection parameters, CodegenSchema pathParametersSchema, @@ -74,7 +73,7 @@ public CodegenOperation( CodegenSchema cookieParametersSchema, boolean hasRequiredParamOrBody, boolean hasOptionalParamOrBody, - List> security, + CodegenList security, Map tags, TreeMap responses, TreeMap statusCodeResponses, diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java index 83f8fd9b0ff..8e857b0c025 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java @@ -7,10 +7,10 @@ public class CodegenPathItem { public final CodegenText summary; public final CodegenText description; public final TreeMap operations; - public final CodegenServers servers; + public final CodegenList servers; public final List parameters; - public CodegenPathItem(CodegenText summary, CodegenText description, TreeMap operations, CodegenServers servers, List parameters) { + public CodegenPathItem(CodegenText summary, CodegenText description, TreeMap operations, CodegenList servers, List parameters) { this.summary = summary; this.description = description; this.operations = operations; diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java index ef243974c18..84181b194a6 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java @@ -122,7 +122,7 @@ public class CodegenSchema { public String subpackage; // the current schema's subpackage, needed by java public CodegenKey containerJsonPathPiece; // needed by java, outer class that has inner nested schema classes public LinkedHashMap typeToExample = null; - public List mapBuilders = null; // used by java + public List> mapBuilders = null; // used by java public CodegenSchema listItemSchema; // 3.1.0 the type of any list item public boolean isCustomSchema() { diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementObject.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementObject.java new file mode 100644 index 00000000000..f124db19b4f --- /dev/null +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementObject.java @@ -0,0 +1,25 @@ +package org.openapijsonschematools.codegen.generators.openapimodels; + +import java.util.AbstractMap; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +public class CodegenSecurityRequirementObject extends AbstractMap { + public final TreeSet imports; + public final Map map; + public final String subpackage; + public final CodegenKey jsonPathPiece; + + public CodegenSecurityRequirementObject(TreeSet imports, Map map, String subpackage, CodegenKey jsonPathPiece) { + this.imports = imports; + this.map = map; + this.subpackage = subpackage; + this.jsonPathPiece = jsonPathPiece; + } + + @Override + public Set> entrySet() { + return this.map.entrySet(); + } +} diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/MapBuilder.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/MapBuilder.java index 86c209c3096..e0cb1c02111 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/MapBuilder.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/MapBuilder.java @@ -2,21 +2,21 @@ import java.util.LinkedHashMap; -public class MapBuilder { - public static class BuilderSchemaPair { - public final MapBuilder builder; - public final CodegenSchema schema; +public class MapBuilder { + public static class BuilderPropertyPair { + public final MapBuilder builder; + public final T property; - public BuilderSchemaPair(MapBuilder builder, CodegenSchema schema) { + public BuilderPropertyPair(MapBuilder builder, T property) { this.builder = builder; - this.schema = schema; + this.property = property; } } public final CodegenKey className; - public final LinkedHashMap keyToBuilder; + public final LinkedHashMap> keyToBuilder; - public MapBuilder(CodegenKey className, LinkedHashMap keyToBuilder) { + public MapBuilder(CodegenKey className, LinkedHashMap> keyToBuilder) { this.className = className; this.keyToBuilder = keyToBuilder; } diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/_objectInputType.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/_objectInputType.hbs index 70813a99e77..4ed922b9945 100644 --- a/src/main/resources/java/src/main/java/packagename/components/schemas/_objectInputType.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/schemas/_objectInputType.hbs @@ -35,7 +35,7 @@ public interface SetterFor{{jsonPathPiece.pascalCase}} { {{/with}} {{#each mapBuilders}} -public static class {{className.pascalCase}}{{#and @first (eq ../additionalProperties null) }} extends UnsetAddPropsSetter<{{className.pascalCase}}>{{/and}} implements {{#if @first}}BaseBuilder<{{#with mapValueSchema}}{{> src/main/java/packagename/components/schemas/types/schema_input_type sourceJsonPath=../../jsonPath forceNull=true noExtends=true }}{{else}}@Nullable Object{{/with}}>{{#if ../optionalProperties}}, {{/if}}{{/if}}{{#each keyToBuilder}}SetterFor{{@key.pascalCase}}<{{builder.className.pascalCase}}>{{#unless @last}}, {{/unless}}{{/each}}{{#and @first ../additionalProperties (eq ../additionalProperties.isBooleanSchemaFalse false) }}, SetterFor{{../additionalProperties.jsonPathPiece.pascalCase}}<{{className.pascalCase}}>{{/and}} { +public static class {{className.pascalCase}}{{#and @first (eq ../additionalProperties null) }} extends UnsetAddPropsSetter<{{className.pascalCase}}>{{/and}} implements {{#if @first}}GenericBuilder src/main/java/packagename/components/schemas/types/schema_input_type sourceJsonPath=../../jsonPath forceNull=true noExtends=true }}{{else}}@Nullable Object{{/with}}>>{{#if ../optionalProperties}}, {{/if}}{{/if}}{{#each keyToBuilder}}SetterFor{{@key.pascalCase}}<{{builder.className.pascalCase}}>{{#unless @last}}, {{/unless}}{{/each}}{{#and @first ../additionalProperties (eq ../additionalProperties.isBooleanSchemaFalse false) }}, SetterFor{{../additionalProperties.jsonPathPiece.pascalCase}}<{{className.pascalCase}}>{{/and}} { private final Map src/main/java/packagename/components/schemas/types/schema_input_type sourceJsonPath=../../jsonPath forceNull=true noExtends=true }}{{else}}@Nullable Object{{/with}}> instance; {{#if @first}} {{#and (eq ../requiredProperties null) (eq ../optionalProperties null) }} diff --git a/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_objectInput.hbs b/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_objectInput.hbs index 6738f031beb..df9c172c150 100644 --- a/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_objectInput.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/schemas/docschema_objectInput.hbs @@ -26,7 +26,7 @@ A class that builds the Map input type | Map src/main/java/packagename/components/schemas/types/schema_input_type sourceJsonPath=../../jsonPath forceNull=true noExtends=true }}{{else}}@Nullable Object{{/with}}> | build()
Returns map input that should be used with Schema.validate | {{/if}} {{#each keyToBuilder}} - {{#with schema }} + {{#with property }} {{#if ../@key.isValid}} {{> src/main/java/packagename/components/schemas/_objectInputSetter forDocs=true builderClass=../builder.className methodName=../@key.original }} {{else}} diff --git a/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme.hbs b/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme.hbs index 19f3403c9ea..39a8f075179 100644 --- a/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme.hbs @@ -7,8 +7,17 @@ package {{packageName}}.components.securityschemes; {{else}} {{#eq type "apiKey"}} -import {{packageName}}.securityschemes.ApiKeySecurityScheme; -import {{packageName}}.securityschemes.ApiKeyInLocation; + {{#eq in "cookie"}} +import {{packageName}}.securityschemes.ApiKeyCookieSecurityScheme; + {{else}} + {{#eq in "header"}} +import {{packageName}}.securityschemes.ApiKeyHeaderSecurityScheme; + {{else}} + {{#eq in "query"}} +import {{packageName}}.securityschemes.ApiKeyQuerySecurityScheme; + {{/eq}} + {{/eq}} + {{/eq}} {{else}} {{#eq type "http"}} {{#eq scheme "basic"}} @@ -38,25 +47,35 @@ import {{packageName}}.securityschemes.OpenIdConnectSecurityScheme; {{/eq}} {{#eq type "apiKey"}} -public class {{jsonPathPiece.pascalCase}} extends ApiKeySecurityScheme { + {{#eq in "cookie"}} +public class {{jsonPathPiece.pascalCase}} extends ApiKeyCookieSecurityScheme { + {{else}} + {{#eq in "header"}} +public class {{jsonPathPiece.pascalCase}} extends ApiKeyHeaderSecurityScheme { + {{else}} + {{#eq in "query"}} +public class {{jsonPathPiece.pascalCase}} extends ApiKeyQuerySecurityScheme { + {{/eq}} + {{/eq}} + {{/eq}} {{#if description}} /* {{description.original}} */ {{/if}} - {{#eq in "query"}} + {{#eq in "cookie"}} public {{jsonPathPiece.pascalCase}}(String apiKey) { - super(apiKey, "{{{name}}}", ApiKeyInLocation.QUERY); + super(apiKey); } {{else}} {{#eq in "header"}} public {{jsonPathPiece.pascalCase}}(String apiKey) { - super(apiKey, "{{{name}}}", ApiKeyInLocation.HEADER); + super(apiKey, "{{{name}}}"); } {{else}} - {{#eq in "cookie"}} + {{#eq in "query"}} public {{jsonPathPiece.pascalCase}}(String apiKey) { - super(apiKey, null, ApiKeyInLocation.COOKIE); + super(apiKey, "{{{name}}}"); } {{/eq}} {{/eq}} diff --git a/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme_doc.hbs b/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme_doc.hbs index e64665d75f8..af871531a3f 100644 --- a/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme_doc.hbs +++ b/src/main/resources/java/src/main/java/packagename/components/securityschemes/SecurityScheme_doc.hbs @@ -11,9 +11,19 @@ | [{{refInfo.refClass}}](../../components/security_schemes/{{refInfo.refModule}}.{{refInfo.refClass}}.md#) |{{#with getDeepestRef}}{{#if description}} {{description.originalWithBr}}{{/if}}{{/with}} {{else}} -public class {{containerJsonPathPiece.pascalCase}} {{jsonPathPiece.pascalCase}} +public class {{jsonPathPiece.pascalCase}} {{#eq type "apiKey"}} -extends ApiKeySecurityScheme + {{#eq in "cookie"}} +extends ApiKeyCookieSecurityScheme + {{else}} + {{#eq in "header"}} +extends ApiKeyHeaderSecurityScheme + {{else}} + {{#eq in "query"}} +extends ApiKeyQuerySecurityScheme + {{/eq}} + {{/eq}} + {{/eq}} {{> src/main/java/packagename/components/securityschemes/_doc_descMethods }} diff --git a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs index a832f9b24f7..b4cc1d11498 100644 --- a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs +++ b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs @@ -1,5 +1,9 @@ package {{{packageName}}}.configurations; +{{#gt allSecurity.size 0}} +import {{{packageName}}}.exceptions.UnsetPropertyException; +import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObject; +{{/gt}} import {{{packageName}}}.servers.Server; {{#each allServers}} {{#if subpackage}} @@ -8,19 +12,39 @@ import {{{packageName}}}.{{subpackage}}.{{jsonPathPiece.pascalCase}}; import {{packageName}}.{{jsonPathPiece.pascalCase}}; {{/if}} {{/each}} +{{#each allSecurity}} + {{#if subpackage}} +import {{{packageName}}}.{{subpackage}}.{{jsonPathPiece.pascalCase}}; + {{else}} +import {{packageName}}.{{jsonPathPiece.pascalCase}}; + {{/if}} +{{/each}} import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Objects; public class ApiConfiguration { private final ServerInfo serverInfo; + {{#gt allSecurity.size 0}} + private final SecurityInfo securityInfo; + {{/gt}} public ApiConfiguration() { serverInfo = new ServerInfo(); + {{#gt allSecurity.size 0}} + securityInfo = new SecurityInfo( + {{#each allSecurity}} + null{{#unless @last}},{{/unless}} + {{/each}} + ); + {{/gt}} } - public ApiConfiguration(ServerInfo serverInfo) { + public ApiConfiguration(ServerInfo serverInfo{{#gt allSecurity.size 0}}, SecurityInfo securityInfo{{/gt}}) { this.serverInfo = serverInfo; + {{#gt allSecurity.size 0}} + this.securityInfo = securityInfo; + {{/gt}} } public static class ServerInfo { @@ -50,4 +74,32 @@ public class ApiConfiguration { return serverInfo.{{jsonPathPiece.camelCase}}.getServer(serverIndex); } {{/each}} + {{#gt allSecurity.size 0}} + + public static class SecurityInfo { + {{#each allSecurity}} + protected final @Nullable {{jsonPathPiece.pascalCase}} {{jsonPathPiece.camelCase}}; + {{/each}} + + public SecurityInfo( + {{#each allSecurity}} + @Nullable {{jsonPathPiece.pascalCase}} {{jsonPathPiece.camelCase}}{{#unless @last}},{{/unless}} + {{/each}} + ) { + {{#each allSecurity}} + this.{{jsonPathPiece.camelCase}} = {{jsonPathPiece.camelCase}}; + {{/each}} + } + } + + {{#each allSecurity}} + public SecurityRequirementObject getSecurityRequirementObject({{jsonPathPiece.pascalCase}}. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { + var securityInfoInstance = securityInfo.{{jsonPathPiece.camelCase}}; + if (securityInfoInstance == null) { + throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the {{jsonPathPiece.pascalCase}} is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + } + return securityInfoInstance.getSecurityRequirementObject(securityIndex); + } + {{/each}} + {{/gt}} } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/schemas/BaseBuilder.hbs b/src/main/resources/java/src/main/java/packagename/schemas/GenericBuilder.hbs similarity index 55% rename from src/main/resources/java/src/main/java/packagename/schemas/BaseBuilder.hbs rename to src/main/resources/java/src/main/java/packagename/schemas/GenericBuilder.hbs index 018cde1beb9..c456cd38958 100644 --- a/src/main/resources/java/src/main/java/packagename/schemas/BaseBuilder.hbs +++ b/src/main/resources/java/src/main/java/packagename/schemas/GenericBuilder.hbs @@ -1,12 +1,9 @@ package {{{packageName}}}.schemas; -import java.util.Map; - /** * Builders must implement this class - * For Map builders, * @param the type that the builder returns */ -public interface BaseBuilder { - Map build(); +public interface GenericBuilder { + T build(); } diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/EmptySecurityRequirementObject.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/EmptySecurityRequirementObject.hbs new file mode 100644 index 00000000000..e94e7b2b3f4 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/EmptySecurityRequirementObject.hbs @@ -0,0 +1,10 @@ +package {{{packageName}}}.securityrequirementobjects; + +import java.util.Map; + +public class EmptySecurityRequirementObject extends SecurityRequirementObject { + + public EmptySecurityRequirementObject() { + super(Map.of()); + } +} diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs new file mode 100644 index 00000000000..3496bfdd44b --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs @@ -0,0 +1,99 @@ +{{#if security.subpackage}} +package {{{packageName}}}.{{security.subpackage}}; +{{else}} +package {{{packageName}}}; +{{/if}} + +import {{{packageName}}}.exceptions.UnsetPropertyException; +{{#each security}} +import {{{packageName}}}.{{subpackage}}.{{jsonPathPiece.pascalCase}}; +{{/each}} +import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObject; +import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObjectProvider; +import {{{packageName}}}.schemas.GenericBuilder; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.EnumMap; + +public class {{security.jsonPathPiece.pascalCase}} implements SecurityRequirementObjectProvider<{{security.jsonPathPiece.pascalCase}}.SecurityIndex> { + final private Securities securities; + final private SecurityIndex securityIndex; + + public {{security.jsonPathPiece.pascalCase}}(Securities securities, SecurityIndex securityIndex) { + this.securities = securities; + this.securityIndex = securityIndex; + } +{{#each security}} + + public interface SetterFor{{jsonPathPiece.pascalCase}} { + Map getInstance(); + T getBuilderAfter{{jsonPathPiece.pascalCase}}(Map instance); + {{> src/main/java/packagename/securityrequirementobjects/_SecurityRequirementObjectSetter methodName=jsonPathPiece.camelCase getBuilderMethod=(join "getBuilderAfter" jsonPathPiece.pascalCase "") }} + } +{{/each}} +{{#each security.builders}} + + public static class {{className.pascalCase}} implements {{#unless @last}}GenericBuilder{{#gt keyToBuilder.size 0}}, {{/gt}}{{/unless}}{{#each keyToBuilder}}SetterFor{{@key.pascalCase}}<{{builder.className.pascalCase}}>{{#unless @last}}, {{/unless}}{{/each}} { + private final Map instance; + {{#if @last }} + public {{className.pascalCase}}() { + this.instance = new HashMap<>(); + } + {{else}} + public {{className.pascalCase}}(Map instance) { + this.instance = instance; + } + {{/if}} + {{#unless @last}} + public Securities build() { + return new Securities(instance); + } + {{/unless}} + {{#gt keyToBuilder.size 0}} + public Map getInstance() { + return instance; + } + {{/gt}} + {{#each keyToBuilder}} + public {{builder.className.pascalCase}} getBuilderAfter{{@key.pascalCase}}(Map instance) { + {{#eq builder ../this}} + {{! property in final builder }} + return this; + {{else}} + return new {{builder.className.pascalCase}}(instance); + {{/eq}} + } + {{/each}} + } +{{/each}} + + public static class Securities { + private final EnumMap securities; + + Securities(Map securityMap) { + securities = new EnumMap<>(securityMap); + } + + public SecurityRequirementObject get(SecurityIndex securityIndex) { + if (securities.containsKey(securityIndex)) { + return get(securityIndex); + } + throw new UnsetPropertyException(securityIndex+" is unset"); + } + } + + public enum SecurityIndex { + {{#each security}} + SECURITY_{{@index}}{{#unless @last}},{{/unless}} + {{/each}} + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs new file mode 100644 index 00000000000..fea1775089d --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs @@ -0,0 +1,14 @@ +package {{{packageName}}}.securityrequirementobjects; + +import {{{packageName}}}.securityschemes.SecurityScheme; + +import java.util.List; +import java.util.Map; + +public class SecurityRequirementObject { + public final Map> securitySchemeToScopes; + + public SecurityRequirementObject(Map> securitySchemeToScopes) { + this.securitySchemeToScopes = securitySchemeToScopes; + } +} diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs new file mode 100644 index 00000000000..4f3a5b8fb93 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs @@ -0,0 +1,38 @@ +package {{{packageName}}}.{{securityRequirementObject.subpackage}}; + +{{#if securityRequirementObject.isEmpty }} +import {{{packageName}}}.securityrequirementobjects.EmptySecurityRequirementObject; + +public class {{securityRequirementObject.jsonPathPiece.pascalCase}} extends EmptySecurityRequirementObject {} +{{else}} +import org.checkerframework.checker.nullness.qual.Nullable; +import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObject; +import {{{packageName}}}.securityschemes.SecurityScheme; + {{#with securityRequirementObject}} +{{> _helper_imports }} + {{/with}} + +import java.util.List; +import java.util.Map; +import java.util.AbstractMap; + +public class {{securityRequirementObject.jsonPathPiece.pascalCase}} extends SecurityRequirementObject { + + public {{securityRequirementObject.jsonPathPiece.pascalCase}}( + {{#each securityRequirementObject}} + {{refInfo.refClass}} securityScheme{{@index}}{{#unless @last}},{{/unless}} + {{/each}} + ) { + super( + Map.ofEntries( + {{#each securityRequirementObject}} + new AbstractMap.SimpleEntry>( + securityScheme{{@index}}, + List.of({{#each scopeNames}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}}) + ){{#unless @last}},{{/unless}} + {{/each}} + ) + ); + } +} +{{/if}} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectProvider.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectProvider.hbs new file mode 100644 index 00000000000..b5d13c1018d --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectProvider.hbs @@ -0,0 +1,9 @@ +package {{{packageName}}}.securityrequirementobjects; + +import {{{packageName}}}.exceptions.UnsetPropertyException; +import org.checkerframework.checker.nullness.qual.Nullable; + +public interface SecurityRequirementObjectProvider { + SecurityRequirementObject getSecurityRequirementObject(@Nullable T securityIndex) throws UnsetPropertyException; +} + diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/_SecurityRequirementObjectSetter.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/_SecurityRequirementObjectSetter.hbs new file mode 100644 index 00000000000..6c9385388df --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/_SecurityRequirementObjectSetter.hbs @@ -0,0 +1,5 @@ +default T {{methodName}}({{jsonPathPiece.pascalCase}} security{{@index}}) { + var instance = getInstance(); + instance.put(SecurityIndex.SECURITY_{{@index}}, security{{@index}}); + return {{getBuilderMethod}}(instance); +} diff --git a/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyCookieSecurityScheme.hbs b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyCookieSecurityScheme.hbs new file mode 100644 index 00000000000..1e499184644 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyCookieSecurityScheme.hbs @@ -0,0 +1,22 @@ +package {{{packageName}}}.securityschemes; + +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.net.http.HttpRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class ApiKeyCookieSecurityScheme implements SecurityScheme { + private final String apiKey; + + protected ApiKeyCookieSecurityScheme(String apiKey) { + this.apiKey = apiKey; + } + + @Override + public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { + List cookieValue = headers.getOrDefault("Cookie", new ArrayList<>()); + cookieValue.add(apiKey); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyHeaderSecurityScheme.hbs b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyHeaderSecurityScheme.hbs new file mode 100644 index 00000000000..850955855d3 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyHeaderSecurityScheme.hbs @@ -0,0 +1,24 @@ +package {{{packageName}}}.securityschemes; + +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.net.http.HttpRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class ApiKeyHeaderSecurityScheme implements SecurityScheme { + private final String apiKey; + private final String name; + + protected ApiKeyHeaderSecurityScheme(String apiKey, String name) { + this.apiKey = apiKey; + this.name = name; + } + + @Override + public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { + List headerValue = headers.getOrDefault(name, new ArrayList<>()); + headerValue.add(apiKey); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyInLocation.hbs b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyInLocation.hbs deleted file mode 100644 index 5b6a521161b..00000000000 --- a/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyInLocation.hbs +++ /dev/null @@ -1,7 +0,0 @@ -package {{{packageName}}}.securityschemes; - -public enum ApiKeyInLocation{ - QUERY, - HEADER, - COOKIE -} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyQuerySecurityScheme.hbs b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyQuerySecurityScheme.hbs new file mode 100644 index 00000000000..fc056de76f9 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeyQuerySecurityScheme.hbs @@ -0,0 +1,23 @@ +package {{{packageName}}}.securityschemes; + +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.net.http.HttpRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class ApiKeyQuerySecurityScheme implements SecurityScheme { + private final String apiKey; + private final String name; + + protected ApiKeyQuerySecurityScheme(String apiKey, String name) { + this.apiKey = apiKey; + this.name = name; + } + + @Override + public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { + throw new UnsupportedOperationException("If you need this, submit a PR adding this feature"); + } +} \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeySecurityScheme.hbs b/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeySecurityScheme.hbs deleted file mode 100644 index 9cca2f661fa..00000000000 --- a/src/main/resources/java/src/main/java/packagename/securityschemes/ApiKeySecurityScheme.hbs +++ /dev/null @@ -1,35 +0,0 @@ -package {{{packageName}}}.securityschemes; - -import org.checkerframework.checker.nullness.qual.Nullable; - -import java.net.http.HttpRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class ApiKeySecurityScheme implements SecurityScheme { - private final String apiKey; - private final @Nullable String name; - private final ApiKeyInLocation inLocation; - - protected ApiKeySecurityScheme(String apiKey, @Nullable String name, ApiKeyInLocation inLocation) { - this.apiKey = apiKey; - this.name = name; - this.inLocation = inLocation; - } - - @Override - public void applyAuth(Map> headers, String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, @Nullable String queryParamsSuffix, List scopeNames) { - switch (inLocation) { - case COOKIE -> { - List cookieValue = headers.getOrDefault("Cookie", new ArrayList<>()); - cookieValue.add(apiKey); - } - case HEADER -> { - List headerValue = headers.getOrDefault(name, new ArrayList<>()); - headerValue.add(apiKey); - } - case QUERY -> throw new UnsupportedOperationException("If you need this, submit a PR adding this feature"); - } - } -} \ No newline at end of file diff --git a/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java b/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java index 2584da109d3..8719d5d1fa5 100644 --- a/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java +++ b/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java @@ -23,9 +23,9 @@ import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; -import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; import org.openapijsonschematools.codegen.common.ModelUtils; -import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServers; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; import org.testng.Assert; import org.testng.annotations.Test; @@ -609,11 +609,11 @@ public void testHandlesTrailingSlashInServers() { generator.opts(opts); generator.configureGeneratorProperties(); - CodegenServers servers = config.fromServers(openAPI.getServers(), "#/servers"); + CodegenList servers = config.fromServers(openAPI.getServers(), "#/servers"); Map bundle = generator.buildSupportFileBundle( null, null, null, null, null, null, servers, null, null); - CodegenServers bundleServers = (CodegenServers) bundle.get("servers"); + CodegenList bundleServers = (CodegenList) bundle.get("servers"); Assert.assertEquals(bundleServers.get(0).url, ""); Assert.assertEquals(bundleServers.get(1).url, "http://trailingshlash.io:80/v1"); Assert.assertEquals(bundleServers.get(2).url, "http://notrailingslash.io:80/v2"); @@ -635,11 +635,11 @@ public void testHandlesRelativeUrlsInServers() { List files = new ArrayList<>(); - CodegenServers servers = config.fromServers(openAPI.getServers(), "#/servers"); + CodegenList servers = config.fromServers(openAPI.getServers(), "#/servers"); Map bundle = generator.buildSupportFileBundle( null, null, null, null, null, null, servers, null, null); - CodegenServers bundleServers = (CodegenServers) bundle.get("servers"); + CodegenList bundleServers = (CodegenList) bundle.get("servers"); Assert.assertEquals(bundleServers.get(0).url, "/relative/url"); }