diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache index c8c6946fef6..29d193fe337 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache @@ -1,4 +1 @@ -{{#required}} - @NotNull -{{/required}} -{{>beanValidationCore}} \ No newline at end of file +{{#required}}@NotNull {{/required}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}@Valid {{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/bodyParams.mustache index 3856b7189ce..1bbadf77645 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache index 519ea86e311..15e243ef808 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache @@ -83,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali @JsonProperty("{{baseName}}") {{/jackson}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") - {{#useBeanValidation}}{{>beanValidation}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}@Valid{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/useBeanValidation}} + {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 813ee8d7e6c..b8938f7f77c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -62,7 +62,7 @@ public class AnotherFakeApi { @io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.call123testSpecialTags(body,securityContext); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java index dceadf1f3b7..150f8e0ee56 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java @@ -72,7 +72,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @Valid XmlItem xmlItem + public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @NotNull @Valid XmlItem xmlItem ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createXmlItem(xmlItem,securityContext); @@ -84,7 +84,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) @Valid Boolean body + public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) Boolean body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body,securityContext); @@ -108,7 +108,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) @Valid BigDecimal body + public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) BigDecimal body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterNumberSerialize(body,securityContext); @@ -120,7 +120,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) }) - public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) @Valid String body + public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) String body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterStringSerialize(body,securityContext); @@ -132,7 +132,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) - public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @Valid FileSchemaTestClass body + public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @NotNull @Valid FileSchemaTestClass body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithFileSchema(body,securityContext); @@ -145,7 +145,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithQueryParams(@ApiParam(value = "",required=true) @QueryParam("query") String query -,@ApiParam(value = "" ,required=true) @Valid User body +,@ApiParam(value = "" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithQueryParams(query,body,securityContext); @@ -157,7 +157,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClientModel(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response testClientModel(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClientModel(body,securityContext); @@ -238,7 +238,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @Valid Map param + public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @NotNull @Valid Map param ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testInlineAdditionalProperties(param,securityContext); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index c8b60b4c75b..217a206a6eb 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -64,7 +64,7 @@ public class FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClassname(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response testClassname(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClassname(body,securityContext); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java index 66d2a66035e..7cbbba0f8bb 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java @@ -69,7 +69,7 @@ public class PetApi { }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) - public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.addPet(body,securityContext); @@ -164,7 +164,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) - public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updatePet(body,securityContext); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java index 3cc23fcacff..ea10c0c053a 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java @@ -108,7 +108,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) - public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @Valid Order body + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.placeOrder(body,securityContext); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java index 518bb2b09cc..84548333121 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java @@ -63,7 +63,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUser(@ApiParam(value = "Created user object" ,required=true) @Valid User body + public Response createUser(@ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUser(body,securityContext); @@ -75,7 +75,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @Valid List body + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body,securityContext); @@ -87,7 +87,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @Valid List body + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body,securityContext); @@ -158,7 +158,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username -,@ApiParam(value = "Updated user object" ,required=true) @Valid User body +,@ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updateUser(username,body,securityContext); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index e9975e4d548..16d03b97f72 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -83,7 +83,7 @@ public class AdditionalPropertiesClass implements Serializable { **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java index f56685cd634..8fc07b32ae8 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java @@ -46,8 +46,7 @@ public class Animal implements Serializable { **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index fd82d64952f..6b73a0037bf 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -52,7 +52,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable { **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 6ccd0ef9652..aa95146db87 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -52,7 +52,7 @@ public class ArrayOfNumberOnly implements Serializable { **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java index 69442303b58..ba70d1b3ae5 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java @@ -86,7 +86,7 @@ public class ArrayTest implements Serializable { **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -114,7 +114,7 @@ public class ArrayTest implements Serializable { **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java index 7c97f8fc887..2f9b11d42c6 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java @@ -64,8 +64,7 @@ public class Category implements Serializable { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java index 870101f63d2..944c5a280be 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java @@ -203,8 +203,7 @@ public class EnumTest implements Serializable { **/ @JsonProperty("enum_string_required") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -264,7 +263,7 @@ public class EnumTest implements Serializable { **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") - @Valid + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 42c691c2c67..3120d541c53 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -46,7 +46,7 @@ public class FileSchemaTestClass implements Serializable { **/ @JsonProperty("file") @ApiModelProperty(value = "") - @Valid + @Valid public java.io.File getFile() { return file; } @@ -74,7 +74,7 @@ public class FileSchemaTestClass implements Serializable { **/ @JsonProperty("files") @ApiModelProperty(value = "") - @Valid + @Valid public List getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java index 9c36d26bf98..daaf5177b00 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java @@ -148,8 +148,7 @@ public class FormatTest implements Serializable { **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2")@Valid + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; } @@ -233,8 +232,7 @@ public class FormatTest implements Serializable { **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } @@ -274,8 +272,7 @@ public class FormatTest implements Serializable { **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public LocalDate getDate() { return date; } @@ -335,8 +332,7 @@ public class FormatTest implements Serializable { **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") - @NotNull - @Size(min=10,max=64) + @NotNull @Size(min=10,max=64) public String getPassword() { return password; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java index 6cbf32c87eb..6cf7fd3cda2 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java @@ -93,7 +93,7 @@ public class MapTest implements Serializable { **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 88ba5317c3b..fe192b7d53e 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -101,7 +101,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl **/ @JsonProperty("map") @ApiModelProperty(value = "") - @Valid + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java index 74308f54525..7f30b89dec1 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java @@ -51,8 +51,7 @@ public class Name implements Serializable { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java index df51a1dad7b..d142dfe821d 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java @@ -42,7 +42,7 @@ public class NumberOnly implements Serializable { **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java index 2103e9b7eac..33a199f111a 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java @@ -48,7 +48,7 @@ public class OuterComposite implements Serializable { **/ @JsonProperty("my_number") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java index e1d46e4a771..63bacbafd4c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java @@ -114,7 +114,7 @@ public class Pet implements Serializable { **/ @JsonProperty("category") @ApiModelProperty(value = "") - @Valid + @Valid public Category getCategory() { return category; } @@ -134,8 +134,7 @@ public class Pet implements Serializable { **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } @@ -160,8 +159,7 @@ public class Pet implements Serializable { **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -189,7 +187,7 @@ public class Pet implements Serializable { **/ @JsonProperty("tags") @ApiModelProperty(value = "") - @Valid + @Valid public List getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 3cdcb620220..83e380ff058 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -56,8 +56,7 @@ public class TypeHolderDefault implements Serializable { **/ @JsonProperty("string_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -77,8 +76,7 @@ public class TypeHolderDefault implements Serializable { **/ @JsonProperty("number_item") @ApiModelProperty(required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -98,8 +96,7 @@ public class TypeHolderDefault implements Serializable { **/ @JsonProperty("integer_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -119,8 +116,7 @@ public class TypeHolderDefault implements Serializable { **/ @JsonProperty("bool_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -145,8 +141,7 @@ public class TypeHolderDefault implements Serializable { **/ @JsonProperty("array_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java index 01974197407..a6c9336b014 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -56,8 +56,7 @@ public class TypeHolderExample implements Serializable { **/ @JsonProperty("string_item") @ApiModelProperty(example = "what", required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -77,8 +76,7 @@ public class TypeHolderExample implements Serializable { **/ @JsonProperty("number_item") @ApiModelProperty(example = "1.234", required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -98,8 +96,7 @@ public class TypeHolderExample implements Serializable { **/ @JsonProperty("integer_item") @ApiModelProperty(example = "-2", required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -119,8 +116,7 @@ public class TypeHolderExample implements Serializable { **/ @JsonProperty("bool_item") @ApiModelProperty(example = "true", required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -145,8 +141,7 @@ public class TypeHolderExample implements Serializable { **/ @JsonProperty("array_item") @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java index a72c63cd1cb..841d0d20a5c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java @@ -148,7 +148,7 @@ public class XmlItem implements Serializable { **/ @JsonProperty("attribute_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -256,7 +256,7 @@ public class XmlItem implements Serializable { **/ @JsonProperty("name_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -392,7 +392,7 @@ public class XmlItem implements Serializable { **/ @JsonProperty("prefix_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -528,7 +528,7 @@ public class XmlItem implements Serializable { **/ @JsonProperty("namespace_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -664,7 +664,7 @@ public class XmlItem implements Serializable { **/ @JsonProperty("prefix_ns_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 09cd0e9c47c..d913a811ad6 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -62,7 +62,7 @@ public class AnotherFakeApi { @io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @Valid Client client + public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client client ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.call123testSpecialTags(client,securityContext); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java index 6cad533f5aa..63beccdfd24 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java @@ -82,7 +82,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) @Valid Boolean body + public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) Boolean body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body,securityContext); @@ -106,7 +106,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) @Valid BigDecimal body + public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) BigDecimal body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterNumberSerialize(body,securityContext); @@ -118,7 +118,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) }) - public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) @Valid String body + public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) String body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterStringSerialize(body,securityContext); @@ -130,7 +130,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) - public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @Valid FileSchemaTestClass fileSchemaTestClass + public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @NotNull @Valid FileSchemaTestClass fileSchemaTestClass ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithFileSchema(fileSchemaTestClass,securityContext); @@ -143,7 +143,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithQueryParams(@ApiParam(value = "",required=true) @QueryParam("query") String query -,@ApiParam(value = "" ,required=true) @Valid User user +,@ApiParam(value = "" ,required=true) @NotNull @Valid User user ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithQueryParams(query,user,securityContext); @@ -155,7 +155,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClientModel(@ApiParam(value = "client model" ,required=true) @Valid Client client + public Response testClientModel(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client client ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClientModel(client,securityContext); @@ -238,7 +238,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @Valid Map requestBody + public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @NotNull @Valid Map requestBody ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testInlineAdditionalProperties(requestBody,securityContext); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index f2552f7d08c..efecb24c110 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -64,7 +64,7 @@ public class FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClassname(@ApiParam(value = "client model" ,required=true) @Valid Client client + public Response testClassname(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client client ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClassname(client,securityContext); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java index 6bfaebc7da2..c02d7aefa8b 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java @@ -69,7 +69,7 @@ public class PetApi { }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) - public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet pet + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet pet ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.addPet(pet,securityContext); @@ -164,7 +164,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) - public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet pet + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet pet ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updatePet(pet,securityContext); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java index 2c079b00655..cffb82ca188 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java @@ -108,7 +108,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) - public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @Valid Order order + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order order ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.placeOrder(order,securityContext); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java index 49ccb236e96..9e9a1b866df 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java @@ -63,7 +63,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUser(@ApiParam(value = "Created user object" ,required=true) @Valid User user + public Response createUser(@ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User user ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUser(user,securityContext); @@ -75,7 +75,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @Valid List user + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List user ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(user,securityContext); @@ -87,7 +87,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @Valid List user + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List user ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(user,securityContext); @@ -158,7 +158,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username -,@ApiParam(value = "Updated user object" ,required=true) @Valid User user +,@ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User user ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updateUser(username,user,securityContext); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 0ca045eb604..a23b475596c 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesClass { **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java index 759bcd00559..da20ad6c04b 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java @@ -45,8 +45,7 @@ public class Animal { **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index f96168b4fb4..2132b6b484f 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly { **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 279c69dd1dd..c69e9e82423 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfNumberOnly { **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java index 824d9a8d39c..6389620a180 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java @@ -85,7 +85,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -113,7 +113,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java index b1e996c5a41..49d4a66361b 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java @@ -63,8 +63,7 @@ public class Category { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java index 26823eb49c5..9a1207f0900 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java @@ -214,8 +214,7 @@ public class EnumTest { **/ @JsonProperty("enum_string_required") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -275,7 +274,7 @@ public class EnumTest { **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") - @Valid + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 12de315baa5..a841db2b866 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -45,7 +45,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("file") @ApiModelProperty(value = "") - @Valid + @Valid public java.io.File getFile() { return file; } @@ -73,7 +73,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("files") @ApiModelProperty(value = "") - @Valid + @Valid public List getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java index 7d6362e23b2..43b7d76b1a1 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java @@ -152,8 +152,7 @@ public class FormatTest { **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2")@Valid + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; } @@ -237,8 +236,7 @@ public class FormatTest { **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public byte[] getByte() { return _byte; } @@ -278,8 +276,7 @@ public class FormatTest { **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Date getDate() { return date; } @@ -339,8 +336,7 @@ public class FormatTest { **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") - @NotNull - @Size(min=10,max=64) + @NotNull @Size(min=10,max=64) public String getPassword() { return password; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java index c9d27e8aa64..998cd30c4d2 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject3.java @@ -148,8 +148,7 @@ public class InlineObject3 { **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "None") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2")@Valid + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; } @@ -192,8 +191,7 @@ public class InlineObject3 { **/ @JsonProperty("double") @ApiModelProperty(required = true, value = "None") - @NotNull - @DecimalMin("67.8") @DecimalMax("123.4") + @NotNull @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { return _double; } @@ -233,8 +231,7 @@ public class InlineObject3 { **/ @JsonProperty("pattern_without_delimiter") @ApiModelProperty(required = true, value = "None") - @NotNull - @Pattern(regexp="^[A-Z].*") + @NotNull @Pattern(regexp="^[A-Z].*") public String getPatternWithoutDelimiter() { return patternWithoutDelimiter; } @@ -254,8 +251,7 @@ public class InlineObject3 { **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "None") - @NotNull - + @NotNull public byte[] getByte() { return _byte; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java index aecb8aab68f..37826835a7b 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject4.java @@ -43,8 +43,7 @@ public class InlineObject4 { **/ @JsonProperty("param") @ApiModelProperty(required = true, value = "field1") - @NotNull - + @NotNull public String getParam() { return param; } @@ -64,8 +63,7 @@ public class InlineObject4 { **/ @JsonProperty("param2") @ApiModelProperty(required = true, value = "field2") - @NotNull - + @NotNull public String getParam2() { return param2; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java index f251f33170f..2b0e1b27d36 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject5.java @@ -64,8 +64,7 @@ public class InlineObject5 { **/ @JsonProperty("requiredFile") @ApiModelProperty(required = true, value = "file to upload") - @NotNull - + @NotNull public File getRequiredFile() { return requiredFile; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java index 5d9826ab0c8..58b45b6c5f0 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineResponseDefault.java @@ -41,7 +41,7 @@ public class InlineResponseDefault { **/ @JsonProperty("string") @ApiModelProperty(value = "") - @Valid + @Valid public Foo getString() { return string; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java index 549e9303382..5933d87796e 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java @@ -92,7 +92,7 @@ public class MapTest { **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0f291a48039..6bd89a57f38 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { **/ @JsonProperty("map") @ApiModelProperty(value = "") - @Valid + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java index 23bd2389f03..c3bf4b7d0bd 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java @@ -50,8 +50,7 @@ public class Name { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java index 4b622a0187b..1f32db47907 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java @@ -41,7 +41,7 @@ public class NumberOnly { **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java index 351583bf105..8cfda8413ee 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java @@ -47,7 +47,7 @@ public class OuterComposite { **/ @JsonProperty("my_number") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java index a74c6936d72..ceac8ea3d68 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java @@ -113,7 +113,7 @@ public class Pet { **/ @JsonProperty("category") @ApiModelProperty(value = "") - @Valid + @Valid public Category getCategory() { return category; } @@ -133,8 +133,7 @@ public class Pet { **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } @@ -159,8 +158,7 @@ public class Pet { **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -188,7 +186,7 @@ public class Pet { **/ @JsonProperty("tags") @ApiModelProperty(value = "") - @Valid + @Valid public List getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 5bd15bff071..5c34ad6a4fd 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -41,7 +41,7 @@ public class AnotherFakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response call123testSpecialTags( - @ApiParam(value = "client model" ,required=true) @Valid Client body, + @ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.call123testSpecialTags(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java index 22fed36491e..52b898a9b83 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -49,7 +49,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createXmlItem( - @ApiParam(value = "XmlItem Body" ,required=true) @Valid XmlItem xmlItem, + @ApiParam(value = "XmlItem Body" ,required=true) @NotNull @Valid XmlItem xmlItem, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createXmlItem(xmlItem,securityContext); @@ -62,7 +62,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) public Response fakeOuterBooleanSerialize( - @ApiParam(value = "Input boolean as post body" ) @Valid Boolean body, + @ApiParam(value = "Input boolean as post body" ) Boolean body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body,securityContext); @@ -88,7 +88,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) public Response fakeOuterNumberSerialize( - @ApiParam(value = "Input number as post body" ) @Valid BigDecimal body, + @ApiParam(value = "Input number as post body" ) BigDecimal body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterNumberSerialize(body,securityContext); @@ -101,7 +101,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) }) public Response fakeOuterStringSerialize( - @ApiParam(value = "Input string as post body" ) @Valid String body, + @ApiParam(value = "Input string as post body" ) String body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterStringSerialize(body,securityContext); @@ -114,7 +114,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithFileSchema( - @ApiParam(value = "" ,required=true) @Valid FileSchemaTestClass body, + @ApiParam(value = "" ,required=true) @NotNull @Valid FileSchemaTestClass body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithFileSchema(body,securityContext); @@ -128,7 +128,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithQueryParams( @ApiParam(value = "",required=true) @QueryParam("query") String query, - @ApiParam(value = "" ,required=true) @Valid User body, + @ApiParam(value = "" ,required=true) @NotNull @Valid User body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithQueryParams(query,body,securityContext); @@ -141,7 +141,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response testClientModel( - @ApiParam(value = "client model" ,required=true) @Valid Client body, + @ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testClientModel(body,securityContext); @@ -223,7 +223,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response testInlineAdditionalProperties( - @ApiParam(value = "request body" ,required=true) @Valid Map param, + @ApiParam(value = "request body" ,required=true) @NotNull @Valid Map param, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testInlineAdditionalProperties(param,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java index 87de86f81f1..3560a628101 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -43,7 +43,7 @@ public class FakeClassnameTags123Api { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response testClassname( - @ApiParam(value = "client model" ,required=true) @Valid Client body, + @ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testClassname(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java index aabdb44c71b..4edb7ecf69f 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -48,7 +48,7 @@ public class PetApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) public Response addPet( - @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body, + @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.addPet(body,securityContext); @@ -142,7 +142,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) public Response updatePet( - @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body, + @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.updatePet(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java index d68850cf881..d1f1b873c37 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -86,7 +86,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) public Response placeOrder( - @ApiParam(value = "order placed for purchasing the pet" ,required=true) @Valid Order body, + @ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.placeOrder(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java index 081af5cc875..9a7b4b7c790 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java @@ -42,7 +42,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUser( - @ApiParam(value = "Created user object" ,required=true) @Valid User body, + @ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createUser(body,securityContext); @@ -55,7 +55,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithArrayInput( - @ApiParam(value = "List of user object" ,required=true) @Valid List body, + @ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body,securityContext); @@ -68,7 +68,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithListInput( - @ApiParam(value = "List of user object" ,required=true) @Valid List body, + @ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body,securityContext); @@ -139,7 +139,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser( @ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, - @ApiParam(value = "Updated user object" ,required=true) @Valid User body, + @ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.updateUser(username,body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 0ca045eb604..a23b475596c 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesClass { **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java index 759bcd00559..da20ad6c04b 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Animal.java @@ -45,8 +45,7 @@ public class Animal { **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index f96168b4fb4..2132b6b484f 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly { **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 279c69dd1dd..c69e9e82423 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfNumberOnly { **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java index 824d9a8d39c..6389620a180 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/ArrayTest.java @@ -85,7 +85,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -113,7 +113,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java index b1e996c5a41..49d4a66361b 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Category.java @@ -63,8 +63,7 @@ public class Category { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..31e4655edea 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -202,8 +202,7 @@ public class EnumTest { **/ @JsonProperty("enum_string_required") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -263,7 +262,7 @@ public class EnumTest { **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") - @Valid + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 12de315baa5..a841db2b866 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -45,7 +45,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("file") @ApiModelProperty(value = "") - @Valid + @Valid public java.io.File getFile() { return file; } @@ -73,7 +73,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("files") @ApiModelProperty(value = "") - @Valid + @Valid public List getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java index 41c3e2f15e1..76b4e153b00 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java @@ -146,8 +146,7 @@ public class FormatTest { **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2")@Valid + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; } @@ -231,8 +230,7 @@ public class FormatTest { **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } @@ -272,8 +270,7 @@ public class FormatTest { **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Date getDate() { return date; } @@ -333,8 +330,7 @@ public class FormatTest { **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") - @NotNull - @Size(min=10,max=64) + @NotNull @Size(min=10,max=64) public String getPassword() { return password; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java index 549e9303382..5933d87796e 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MapTest.java @@ -92,7 +92,7 @@ public class MapTest { **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0f291a48039..6bd89a57f38 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { **/ @JsonProperty("map") @ApiModelProperty(value = "") - @Valid + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java index 23bd2389f03..c3bf4b7d0bd 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Name.java @@ -50,8 +50,7 @@ public class Name { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java index 4b622a0187b..1f32db47907 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/NumberOnly.java @@ -41,7 +41,7 @@ public class NumberOnly { **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java index 351583bf105..8cfda8413ee 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterComposite.java @@ -47,7 +47,7 @@ public class OuterComposite { **/ @JsonProperty("my_number") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java index a74c6936d72..ceac8ea3d68 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -113,7 +113,7 @@ public class Pet { **/ @JsonProperty("category") @ApiModelProperty(value = "") - @Valid + @Valid public Category getCategory() { return category; } @@ -133,8 +133,7 @@ public class Pet { **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } @@ -159,8 +158,7 @@ public class Pet { **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -188,7 +186,7 @@ public class Pet { **/ @JsonProperty("tags") @ApiModelProperty(value = "") - @Valid + @Valid public List getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 2a384ca2a84..bde164cad5a 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -55,8 +55,7 @@ public class TypeHolderDefault { **/ @JsonProperty("string_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderDefault { **/ @JsonProperty("number_item") @ApiModelProperty(required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderDefault { **/ @JsonProperty("integer_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderDefault { **/ @JsonProperty("bool_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderDefault { **/ @JsonProperty("array_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java index d87732ad93e..b4733da0bcf 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -55,8 +55,7 @@ public class TypeHolderExample { **/ @JsonProperty("string_item") @ApiModelProperty(example = "what", required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderExample { **/ @JsonProperty("number_item") @ApiModelProperty(example = "1.234", required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderExample { **/ @JsonProperty("integer_item") @ApiModelProperty(example = "-2", required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderExample { **/ @JsonProperty("bool_item") @ApiModelProperty(example = "true", required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderExample { **/ @JsonProperty("array_item") @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java index a50e27d4cf8..f1d4ad1aaa4 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/XmlItem.java @@ -147,7 +147,7 @@ public class XmlItem { **/ @JsonProperty("attribute_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -255,7 +255,7 @@ public class XmlItem { **/ @JsonProperty("name_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -391,7 +391,7 @@ public class XmlItem { **/ @JsonProperty("prefix_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -527,7 +527,7 @@ public class XmlItem { **/ @JsonProperty("namespace_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -663,7 +663,7 @@ public class XmlItem { **/ @JsonProperty("prefix_ns_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 661dee36409..06e2e221681 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -41,7 +41,7 @@ public class AnotherFakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response call123testSpecialTags( - @ApiParam(value = "client model" ,required=true) @Valid Client body, + @ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.call123testSpecialTags(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java index cc144b42de7..43e3ba437b5 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java @@ -50,7 +50,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createXmlItem( - @ApiParam(value = "XmlItem Body" ,required=true) @Valid XmlItem xmlItem, + @ApiParam(value = "XmlItem Body" ,required=true) @NotNull @Valid XmlItem xmlItem, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createXmlItem(xmlItem,securityContext); @@ -63,7 +63,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) public Response fakeOuterBooleanSerialize( - @ApiParam(value = "Input boolean as post body" ) @Valid Boolean body, + @ApiParam(value = "Input boolean as post body" ) Boolean body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body,securityContext); @@ -89,7 +89,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) public Response fakeOuterNumberSerialize( - @ApiParam(value = "Input number as post body" ) @Valid BigDecimal body, + @ApiParam(value = "Input number as post body" ) BigDecimal body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterNumberSerialize(body,securityContext); @@ -102,7 +102,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) }) public Response fakeOuterStringSerialize( - @ApiParam(value = "Input string as post body" ) @Valid String body, + @ApiParam(value = "Input string as post body" ) String body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterStringSerialize(body,securityContext); @@ -115,7 +115,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithFileSchema( - @ApiParam(value = "" ,required=true) @Valid FileSchemaTestClass body, + @ApiParam(value = "" ,required=true) @NotNull @Valid FileSchemaTestClass body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithFileSchema(body,securityContext); @@ -129,7 +129,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithQueryParams( @ApiParam(value = "",required=true) @QueryParam("query") String query, - @ApiParam(value = "" ,required=true) @Valid User body, + @ApiParam(value = "" ,required=true) @NotNull @Valid User body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithQueryParams(query,body,securityContext); @@ -142,7 +142,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response testClientModel( - @ApiParam(value = "client model" ,required=true) @Valid Client body, + @ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testClientModel(body,securityContext); @@ -224,7 +224,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response testInlineAdditionalProperties( - @ApiParam(value = "request body" ,required=true) @Valid Map param, + @ApiParam(value = "request body" ,required=true) @NotNull @Valid Map param, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testInlineAdditionalProperties(param,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index d4c309bf99f..f7040e448d3 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -43,7 +43,7 @@ public class FakeClassnameTestApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response testClassname( - @ApiParam(value = "client model" ,required=true) @Valid Client body, + @ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.testClassname(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java index 3a37d17a2e0..b8dd3905e8f 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java @@ -48,7 +48,7 @@ public class PetApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) public Response addPet( - @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body, + @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.addPet(body,securityContext); @@ -142,7 +142,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) public Response updatePet( - @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body, + @ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.updatePet(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java index 51bf3f70d1c..feacbbfb7e0 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java @@ -86,7 +86,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) public Response placeOrder( - @ApiParam(value = "order placed for purchasing the pet" ,required=true) @Valid Order body, + @ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.placeOrder(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java index 8c4ab6de3bf..8a2616ef405 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java @@ -42,7 +42,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUser( - @ApiParam(value = "Created user object" ,required=true) @Valid User body, + @ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createUser(body,securityContext); @@ -55,7 +55,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithArrayInput( - @ApiParam(value = "List of user object" ,required=true) @Valid List body, + @ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body,securityContext); @@ -68,7 +68,7 @@ public class UserApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) public Response createUsersWithListInput( - @ApiParam(value = "List of user object" ,required=true) @Valid List body, + @ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body,securityContext); @@ -139,7 +139,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser( @ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, - @ApiParam(value = "Updated user object" ,required=true) @Valid User body, + @ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User body, @Context SecurityContext securityContext) throws NotFoundException { return delegate.updateUser(username,body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 0ca045eb604..a23b475596c 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesClass { **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java index 759bcd00559..da20ad6c04b 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Animal.java @@ -45,8 +45,7 @@ public class Animal { **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index f96168b4fb4..2132b6b484f 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly { **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 279c69dd1dd..c69e9e82423 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfNumberOnly { **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java index 824d9a8d39c..6389620a180 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/ArrayTest.java @@ -85,7 +85,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -113,7 +113,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java index b1e996c5a41..49d4a66361b 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Category.java @@ -63,8 +63,7 @@ public class Category { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..31e4655edea 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumTest.java @@ -202,8 +202,7 @@ public class EnumTest { **/ @JsonProperty("enum_string_required") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -263,7 +262,7 @@ public class EnumTest { **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") - @Valid + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 12de315baa5..a841db2b866 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -45,7 +45,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("file") @ApiModelProperty(value = "") - @Valid + @Valid public java.io.File getFile() { return file; } @@ -73,7 +73,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("files") @ApiModelProperty(value = "") - @Valid + @Valid public List getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java index 41c3e2f15e1..76b4e153b00 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java @@ -146,8 +146,7 @@ public class FormatTest { **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2")@Valid + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; } @@ -231,8 +230,7 @@ public class FormatTest { **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } @@ -272,8 +270,7 @@ public class FormatTest { **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Date getDate() { return date; } @@ -333,8 +330,7 @@ public class FormatTest { **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") - @NotNull - @Size(min=10,max=64) + @NotNull @Size(min=10,max=64) public String getPassword() { return password; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java index 549e9303382..5933d87796e 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MapTest.java @@ -92,7 +92,7 @@ public class MapTest { **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0f291a48039..6bd89a57f38 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { **/ @JsonProperty("map") @ApiModelProperty(value = "") - @Valid + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java index 23bd2389f03..c3bf4b7d0bd 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Name.java @@ -50,8 +50,7 @@ public class Name { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java index 4b622a0187b..1f32db47907 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/NumberOnly.java @@ -41,7 +41,7 @@ public class NumberOnly { **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java index 351583bf105..8cfda8413ee 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterComposite.java @@ -47,7 +47,7 @@ public class OuterComposite { **/ @JsonProperty("my_number") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java index a74c6936d72..ceac8ea3d68 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java @@ -113,7 +113,7 @@ public class Pet { **/ @JsonProperty("category") @ApiModelProperty(value = "") - @Valid + @Valid public Category getCategory() { return category; } @@ -133,8 +133,7 @@ public class Pet { **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } @@ -159,8 +158,7 @@ public class Pet { **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -188,7 +186,7 @@ public class Pet { **/ @JsonProperty("tags") @ApiModelProperty(value = "") - @Valid + @Valid public List getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 2a384ca2a84..bde164cad5a 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -55,8 +55,7 @@ public class TypeHolderDefault { **/ @JsonProperty("string_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderDefault { **/ @JsonProperty("number_item") @ApiModelProperty(required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderDefault { **/ @JsonProperty("integer_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderDefault { **/ @JsonProperty("bool_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderDefault { **/ @JsonProperty("array_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java index d87732ad93e..b4733da0bcf 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -55,8 +55,7 @@ public class TypeHolderExample { **/ @JsonProperty("string_item") @ApiModelProperty(example = "what", required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderExample { **/ @JsonProperty("number_item") @ApiModelProperty(example = "1.234", required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderExample { **/ @JsonProperty("integer_item") @ApiModelProperty(example = "-2", required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderExample { **/ @JsonProperty("bool_item") @ApiModelProperty(example = "true", required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderExample { **/ @JsonProperty("array_item") @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java index a50e27d4cf8..f1d4ad1aaa4 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/XmlItem.java @@ -147,7 +147,7 @@ public class XmlItem { **/ @JsonProperty("attribute_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -255,7 +255,7 @@ public class XmlItem { **/ @JsonProperty("name_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -391,7 +391,7 @@ public class XmlItem { **/ @JsonProperty("prefix_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -527,7 +527,7 @@ public class XmlItem { **/ @JsonProperty("namespace_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -663,7 +663,7 @@ public class XmlItem { **/ @JsonProperty("prefix_ns_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java index c98ac769932..589252d85ac 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -62,7 +62,7 @@ public class AnotherFakeApi { @io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.call123testSpecialTags(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java index 814f95f5c83..966c58a8915 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -70,7 +70,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @Valid XmlItem xmlItem + public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @NotNull @Valid XmlItem xmlItem ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createXmlItem(xmlItem,securityContext); @@ -82,7 +82,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) @Valid Boolean body + public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) Boolean body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body,securityContext); @@ -106,7 +106,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) @Valid BigDecimal body + public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) BigDecimal body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterNumberSerialize(body,securityContext); @@ -118,7 +118,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) }) - public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) @Valid String body + public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) String body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterStringSerialize(body,securityContext); @@ -130,7 +130,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) - public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @Valid FileSchemaTestClass body + public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @NotNull @Valid FileSchemaTestClass body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithFileSchema(body,securityContext); @@ -143,7 +143,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithQueryParams(@ApiParam(value = "",required=true) @QueryParam("query") String query -,@ApiParam(value = "" ,required=true) @Valid User body +,@ApiParam(value = "" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithQueryParams(query,body,securityContext); @@ -155,7 +155,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClientModel(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response testClientModel(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClientModel(body,securityContext); @@ -236,7 +236,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @Valid Map param + public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @NotNull @Valid Map param ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testInlineAdditionalProperties(param,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java index 0b102a219ec..a2d92c833a3 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -64,7 +64,7 @@ public class FakeClassnameTags123Api { }, tags={ "fake_classname_tags 123#$%^", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClassname(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response testClassname(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClassname(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java index f2dd168ccb5..8e844d8ea05 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -69,7 +69,7 @@ public class PetApi { }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) - public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.addPet(body,securityContext); @@ -164,7 +164,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) - public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updatePet(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java index 8f964ca9c5c..3c76a0c77d6 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -108,7 +108,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) - public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @Valid Order body + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.placeOrder(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java index 9b9ea382431..8d013c41231 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java @@ -63,7 +63,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUser(@ApiParam(value = "Created user object" ,required=true) @Valid User body + public Response createUser(@ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUser(body,securityContext); @@ -75,7 +75,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @Valid List body + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body,securityContext); @@ -87,7 +87,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @Valid List body + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body,securityContext); @@ -158,7 +158,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username -,@ApiParam(value = "Updated user object" ,required=true) @Valid User body +,@ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updateUser(username,body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 0ca045eb604..a23b475596c 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesClass { **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java index 759bcd00559..da20ad6c04b 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Animal.java @@ -45,8 +45,7 @@ public class Animal { **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index f96168b4fb4..2132b6b484f 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly { **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 279c69dd1dd..c69e9e82423 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfNumberOnly { **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java index 824d9a8d39c..6389620a180 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java @@ -85,7 +85,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -113,7 +113,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java index b1e996c5a41..49d4a66361b 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Category.java @@ -63,8 +63,7 @@ public class Category { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..31e4655edea 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -202,8 +202,7 @@ public class EnumTest { **/ @JsonProperty("enum_string_required") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -263,7 +262,7 @@ public class EnumTest { **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") - @Valid + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 12de315baa5..a841db2b866 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -45,7 +45,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("file") @ApiModelProperty(value = "") - @Valid + @Valid public java.io.File getFile() { return file; } @@ -73,7 +73,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("files") @ApiModelProperty(value = "") - @Valid + @Valid public List getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java index 41c3e2f15e1..76b4e153b00 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java @@ -146,8 +146,7 @@ public class FormatTest { **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2")@Valid + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; } @@ -231,8 +230,7 @@ public class FormatTest { **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } @@ -272,8 +270,7 @@ public class FormatTest { **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Date getDate() { return date; } @@ -333,8 +330,7 @@ public class FormatTest { **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") - @NotNull - @Size(min=10,max=64) + @NotNull @Size(min=10,max=64) public String getPassword() { return password; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java index 549e9303382..5933d87796e 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java @@ -92,7 +92,7 @@ public class MapTest { **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0f291a48039..6bd89a57f38 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { **/ @JsonProperty("map") @ApiModelProperty(value = "") - @Valid + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java index 23bd2389f03..c3bf4b7d0bd 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Name.java @@ -50,8 +50,7 @@ public class Name { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java index 4b622a0187b..1f32db47907 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/NumberOnly.java @@ -41,7 +41,7 @@ public class NumberOnly { **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java index 351583bf105..8cfda8413ee 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterComposite.java @@ -47,7 +47,7 @@ public class OuterComposite { **/ @JsonProperty("my_number") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java index a74c6936d72..ceac8ea3d68 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -113,7 +113,7 @@ public class Pet { **/ @JsonProperty("category") @ApiModelProperty(value = "") - @Valid + @Valid public Category getCategory() { return category; } @@ -133,8 +133,7 @@ public class Pet { **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } @@ -159,8 +158,7 @@ public class Pet { **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -188,7 +186,7 @@ public class Pet { **/ @JsonProperty("tags") @ApiModelProperty(value = "") - @Valid + @Valid public List getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 2a384ca2a84..bde164cad5a 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -55,8 +55,7 @@ public class TypeHolderDefault { **/ @JsonProperty("string_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderDefault { **/ @JsonProperty("number_item") @ApiModelProperty(required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderDefault { **/ @JsonProperty("integer_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderDefault { **/ @JsonProperty("bool_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderDefault { **/ @JsonProperty("array_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java index d87732ad93e..b4733da0bcf 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -55,8 +55,7 @@ public class TypeHolderExample { **/ @JsonProperty("string_item") @ApiModelProperty(example = "what", required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderExample { **/ @JsonProperty("number_item") @ApiModelProperty(example = "1.234", required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderExample { **/ @JsonProperty("integer_item") @ApiModelProperty(example = "-2", required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderExample { **/ @JsonProperty("bool_item") @ApiModelProperty(example = "true", required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderExample { **/ @JsonProperty("array_item") @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java index a50e27d4cf8..f1d4ad1aaa4 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/XmlItem.java @@ -147,7 +147,7 @@ public class XmlItem { **/ @JsonProperty("attribute_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -255,7 +255,7 @@ public class XmlItem { **/ @JsonProperty("name_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -391,7 +391,7 @@ public class XmlItem { **/ @JsonProperty("prefix_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -527,7 +527,7 @@ public class XmlItem { **/ @JsonProperty("namespace_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -663,7 +663,7 @@ public class XmlItem { **/ @JsonProperty("prefix_ns_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 813ee8d7e6c..b8938f7f77c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -62,7 +62,7 @@ public class AnotherFakeApi { @io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.call123testSpecialTags(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java index 4d256a69769..03182bd31f6 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java @@ -71,7 +71,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @Valid XmlItem xmlItem + public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @NotNull @Valid XmlItem xmlItem ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createXmlItem(xmlItem,securityContext); @@ -83,7 +83,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) }) - public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) @Valid Boolean body + public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) Boolean body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body,securityContext); @@ -107,7 +107,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) }) - public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) @Valid BigDecimal body + public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) BigDecimal body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterNumberSerialize(body,securityContext); @@ -119,7 +119,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) }) - public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) @Valid String body + public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) String body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeOuterStringSerialize(body,securityContext); @@ -131,7 +131,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) - public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @Valid FileSchemaTestClass body + public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @NotNull @Valid FileSchemaTestClass body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithFileSchema(body,securityContext); @@ -144,7 +144,7 @@ public class FakeApi { @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) }) public Response testBodyWithQueryParams(@ApiParam(value = "",required=true) @QueryParam("query") String query -,@ApiParam(value = "" ,required=true) @Valid User body +,@ApiParam(value = "" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testBodyWithQueryParams(query,body,securityContext); @@ -156,7 +156,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClientModel(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response testClientModel(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClientModel(body,securityContext); @@ -237,7 +237,7 @@ public class FakeApi { @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @Valid Map param + public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @NotNull @Valid Map param ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testInlineAdditionalProperties(param,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index c8b60b4c75b..217a206a6eb 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -64,7 +64,7 @@ public class FakeClassnameTestApi { }, tags={ "fake_classname_tags 123#$%^", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - public Response testClassname(@ApiParam(value = "client model" ,required=true) @Valid Client body + public Response testClassname(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.testClassname(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java index 2f6c1736900..09d3bf9d55e 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java @@ -69,7 +69,7 @@ public class PetApi { }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) }) - public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body + public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.addPet(body,securityContext); @@ -164,7 +164,7 @@ public class PetApi { @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class), @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) }) - public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @Valid Pet body + public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updatePet(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java index 3cc23fcacff..ea10c0c053a 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java @@ -108,7 +108,7 @@ public class StoreApi { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) }) - public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @Valid Order body + public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.placeOrder(body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java index 518bb2b09cc..84548333121 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java @@ -63,7 +63,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUser(@ApiParam(value = "Created user object" ,required=true) @Valid User body + public Response createUser(@ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUser(body,securityContext); @@ -75,7 +75,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @Valid List body + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body,securityContext); @@ -87,7 +87,7 @@ public class UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @Valid List body + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body,securityContext); @@ -158,7 +158,7 @@ public class UserApi { @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) }) public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username -,@ApiParam(value = "Updated user object" ,required=true) @Valid User body +,@ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User body ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.updateUser(username,body,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 0ca045eb604..a23b475596c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -82,7 +82,7 @@ public class AdditionalPropertiesClass { **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java index 759bcd00559..da20ad6c04b 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Animal.java @@ -45,8 +45,7 @@ public class Animal { **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getClassName() { return className; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index f96168b4fb4..2132b6b484f 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly { **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 279c69dd1dd..c69e9e82423 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -51,7 +51,7 @@ public class ArrayOfNumberOnly { **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") - @Valid + @Valid public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java index 824d9a8d39c..6389620a180 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java @@ -85,7 +85,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -113,7 +113,7 @@ public class ArrayTest { **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") - @Valid + @Valid public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java index b1e996c5a41..49d4a66361b 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Category.java @@ -63,8 +63,7 @@ public class Category { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..31e4655edea 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java @@ -202,8 +202,7 @@ public class EnumTest { **/ @JsonProperty("enum_string_required") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public EnumStringRequiredEnum getEnumStringRequired() { return enumStringRequired; } @@ -263,7 +262,7 @@ public class EnumTest { **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") - @Valid + @Valid public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 12de315baa5..a841db2b866 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -45,7 +45,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("file") @ApiModelProperty(value = "") - @Valid + @Valid public java.io.File getFile() { return file; } @@ -73,7 +73,7 @@ public class FileSchemaTestClass { **/ @JsonProperty("files") @ApiModelProperty(value = "") - @Valid + @Valid public List getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java index 41c3e2f15e1..76b4e153b00 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java @@ -146,8 +146,7 @@ public class FormatTest { **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") - @NotNull - @DecimalMin("32.1") @DecimalMax("543.2")@Valid + @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; } @@ -231,8 +230,7 @@ public class FormatTest { **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") - @NotNull - @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") + @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } @@ -272,8 +270,7 @@ public class FormatTest { **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Date getDate() { return date; } @@ -333,8 +330,7 @@ public class FormatTest { **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") - @NotNull - @Size(min=10,max=64) + @NotNull @Size(min=10,max=64) public String getPassword() { return password; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java index 549e9303382..5933d87796e 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java @@ -92,7 +92,7 @@ public class MapTest { **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") - @Valid + @Valid public Map> getMapMapOfString() { return mapMapOfString; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0f291a48039..6bd89a57f38 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { **/ @JsonProperty("map") @ApiModelProperty(value = "") - @Valid + @Valid public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java index 23bd2389f03..c3bf4b7d0bd 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Name.java @@ -50,8 +50,7 @@ public class Name { **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getName() { return name; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java index 4b622a0187b..1f32db47907 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/NumberOnly.java @@ -41,7 +41,7 @@ public class NumberOnly { **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java index 351583bf105..8cfda8413ee 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterComposite.java @@ -47,7 +47,7 @@ public class OuterComposite { **/ @JsonProperty("my_number") @ApiModelProperty(value = "") - @Valid + @Valid public BigDecimal getMyNumber() { return myNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java index a74c6936d72..ceac8ea3d68 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java @@ -113,7 +113,7 @@ public class Pet { **/ @JsonProperty("category") @ApiModelProperty(value = "") - @Valid + @Valid public Category getCategory() { return category; } @@ -133,8 +133,7 @@ public class Pet { **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") - @NotNull - + @NotNull public String getName() { return name; } @@ -159,8 +158,7 @@ public class Pet { **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getPhotoUrls() { return photoUrls; } @@ -188,7 +186,7 @@ public class Pet { **/ @JsonProperty("tags") @ApiModelProperty(value = "") - @Valid + @Valid public List getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 2a384ca2a84..bde164cad5a 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -55,8 +55,7 @@ public class TypeHolderDefault { **/ @JsonProperty("string_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderDefault { **/ @JsonProperty("number_item") @ApiModelProperty(required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderDefault { **/ @JsonProperty("integer_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderDefault { **/ @JsonProperty("bool_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderDefault { **/ @JsonProperty("array_item") @ApiModelProperty(required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java index d87732ad93e..b4733da0bcf 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -55,8 +55,7 @@ public class TypeHolderExample { **/ @JsonProperty("string_item") @ApiModelProperty(example = "what", required = true, value = "") - @NotNull - + @NotNull public String getStringItem() { return stringItem; } @@ -76,8 +75,7 @@ public class TypeHolderExample { **/ @JsonProperty("number_item") @ApiModelProperty(example = "1.234", required = true, value = "") - @NotNull -@Valid + @NotNull @Valid public BigDecimal getNumberItem() { return numberItem; } @@ -97,8 +95,7 @@ public class TypeHolderExample { **/ @JsonProperty("integer_item") @ApiModelProperty(example = "-2", required = true, value = "") - @NotNull - + @NotNull public Integer getIntegerItem() { return integerItem; } @@ -118,8 +115,7 @@ public class TypeHolderExample { **/ @JsonProperty("bool_item") @ApiModelProperty(example = "true", required = true, value = "") - @NotNull - + @NotNull public Boolean getBoolItem() { return boolItem; } @@ -144,8 +140,7 @@ public class TypeHolderExample { **/ @JsonProperty("array_item") @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") - @NotNull - + @NotNull public List getArrayItem() { return arrayItem; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java index a50e27d4cf8..f1d4ad1aaa4 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/XmlItem.java @@ -147,7 +147,7 @@ public class XmlItem { **/ @JsonProperty("attribute_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getAttributeNumber() { return attributeNumber; } @@ -255,7 +255,7 @@ public class XmlItem { **/ @JsonProperty("name_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNameNumber() { return nameNumber; } @@ -391,7 +391,7 @@ public class XmlItem { **/ @JsonProperty("prefix_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNumber() { return prefixNumber; } @@ -527,7 +527,7 @@ public class XmlItem { **/ @JsonProperty("namespace_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getNamespaceNumber() { return namespaceNumber; } @@ -663,7 +663,7 @@ public class XmlItem { **/ @JsonProperty("prefix_ns_number") @ApiModelProperty(example = "1.234", value = "") - @Valid + @Valid public BigDecimal getPrefixNsNumber() { return prefixNsNumber; }