diff --git a/bin/configs/java-jersey3.yaml b/bin/configs/java-jersey3.yaml index 50ea3258eca..6dee333c835 100644 --- a/bin/configs/java-jersey3.yaml +++ b/bin/configs/java-jersey3.yaml @@ -4,6 +4,7 @@ library: jersey3 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: + useBeanValidation: true artifactId: petstore-jersey3 hideGenerationTimestamp: true serverPort: "8082" diff --git a/bin/configs/java-retrofit2-play26.yaml b/bin/configs/java-retrofit2-play26.yaml index b65e8a3a95c..0e457c3f066 100644 --- a/bin/configs/java-retrofit2-play26.yaml +++ b/bin/configs/java-retrofit2-play26.yaml @@ -10,3 +10,4 @@ additionalProperties: playVersion: play26 artifactId: petstore-java-client-retrofit2-play26 hideGenerationTimestamp: "true" + useJakartaEe: "true" diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache index d5c7d012a29..2329ffb285c 100644 --- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache @@ -120,6 +120,9 @@ ext { jackson_databind_nullable_version = "0.2.6" {{/openApiNullable}} jakarta_annotation_version = "1.3.5" + {{#useBeanValidation}} + bean_validation_version = "3.0.2" + {{/useBeanValidation}} jersey_version = "1.19.4" jodatime_version = "2.9.9" junit_version = "4.13.2" @@ -142,5 +145,8 @@ dependencies { {{/joda}} implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + {{#useBeanValidation}} + implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version" + {{/useBeanValidation}} testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache index 5f8019da4f4..a9ba62f69eb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache @@ -11,6 +11,11 @@ import {{javaxPackage}}.ws.rs.core.GenericType; {{#imports}}import {{import}}; {{/imports}} +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; + +{{/useBeanValidation}} import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index c9d4d3127dc..a0bb4630af5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -105,6 +105,9 @@ ext { jackson_databind_nullable_version = "0.2.6" {{/openApiNullable}} jakarta_annotation_version = "1.3.5" + {{#useBeanValidation}} + bean_validation_version = "3.0.2" + {{/useBeanValidation}} jersey_version = "2.35" junit_version = "5.8.2" {{#hasOAuthMethods}} @@ -140,6 +143,9 @@ dependencies { implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" {{/hasHttpSignatureMethods}} implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + {{#useBeanValidation}} + implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version" + {{/useBeanValidation}} testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index 48bdf7c3790..1b0a61159b9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -406,7 +406,7 @@ 1.3.5 {{/useJakartaEe}} {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} 5.10.0 {{#hasHttpSignatureMethods}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache index 5f8019da4f4..a9ba62f69eb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/api.mustache @@ -11,6 +11,11 @@ import {{javaxPackage}}.ws.rs.core.GenericType; {{#imports}}import {{import}}; {{/imports}} +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; + +{{/useBeanValidation}} import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache index 9a722a04e0b..472f699a460 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache @@ -105,6 +105,9 @@ ext { jackson_databind_nullable_version = "0.2.6" {{/openApiNullable}} jakarta_annotation_version = "2.1.0" + {{#useBeanValidation}} + bean_validation_version = "3.0.2" + {{/useBeanValidation}} jersey_version = "3.0.4" junit_version = "5.8.2" {{#hasOAuthMethods}} @@ -140,6 +143,10 @@ dependencies { implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" {{/hasHttpSignatureMethods}} implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + {{#useBeanValidation}} + implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version" + {{/useBeanValidation}} + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache index cd70a27e36a..eeaf469c0b1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache @@ -401,7 +401,7 @@ 0.2.6 2.1.1 {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} 5.10.0 {{#hasHttpSignatureMethods}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache index 21e9df81f6f..c91673c896c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache @@ -215,7 +215,7 @@ 4.13.2 1.4.14 {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} 3.2.7 2.15.2 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index 06093726054..14096ac4c52 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -436,7 +436,7 @@ 3.0.3 {{/performBeanValidation}} {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} 5.10.0 1.10.0 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index f81e4632b64..a04fdd6c7c9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -157,7 +157,7 @@ dependencies { {{/joda}} implementation "com.squareup.okio:okio:$okio_version" {{#useBeanValidation}} - implementation "jakarta.validation:jakarta.validation-api:2.0.2" + implementation "jakarta.validation:jakarta.validation-api:3.0.2" {{/useBeanValidation}} {{#performBeanValidation}} implementation "org.hibernate:hibernate-validator:6.0.19.Final" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache index 1b9aa139dfc..3476f0659da 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache @@ -37,7 +37,7 @@ lazy val root = (project in file(".")). {{/joda}} "com.squareup.okio" % "okio" % "1.17.5" % "compile", {{#useBeanValidation}} - "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile", {{/useBeanValidation}} {{#performBeanValidation}} "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index cab00e2887f..e39ea4a509b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -364,7 +364,7 @@ 1.3.5 {{/useJakartaEe}} {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} 3.6.0 4.13.2 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index aac68fa5275..b0ba6fd702d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -374,7 +374,7 @@ 2.9.9 {{/joda}} {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} {{#performBeanValidation}} 5.4.3.Final diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index 522c475f1c2..a36624da899 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -150,7 +150,7 @@ dependencies { implementation "com.typesafe.play:play-ahc-ws_2.12:$play_version" {{/usePlayWS}} {{#jackson}} - implementation "jakarta.validation:jakarta.validation-api:2.0.2" + implementation "jakarta.validation:jakarta.validation-api:3.0.2" implementation "com.squareup.retrofit2:converter-jackson:$retrofit_version" implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache index 7c0ff52b770..bc1f613088b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache @@ -16,7 +16,7 @@ lazy val root = (project in file(".")). {{/usePlayWS}} {{#usePlayWS}} "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", - "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.15.2" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.15.2" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 00edcf10dc9..987581e3f80 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -405,7 +405,7 @@ 1.3.5 {{/useJakartaEe}} {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} 1.0.1 4.13.2 diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache index 50fe9fd4746..1c213ae2c8c 100644 --- a/modules/openapi-generator/src/main/resources/Java/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache @@ -358,9 +358,8 @@ {{^useJakartaEe}} 1.3.5 {{/useJakartaEe}} - {{#useBeanValidation}} - 2.0.2 + 3.0.2 {{/useBeanValidation}} 1.0.0 4.13.2 diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 9da1b5781f9..c9a21cf8f27 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -1168,6 +1168,23 @@ paths: application/json: schema: $ref: '#/components/schemas/ArrayOfEnums' + /fake/request-array-string: + post: + tags: + - fake + summary: Array of string + operationId: postArrayOfString + requestBody: + content: + "application/json": + schema: + type: array + items: + type: string + pattern: "[A-Z0-9]+" + responses: + 200: + description: ok servers: - url: 'http://{server}.swagger.io:{port}/v2' description: petstore server diff --git a/samples/client/petstore/java/jersey3/README.md b/samples/client/petstore/java/jersey3/README.md index 0c83eef30c4..c217d3680f0 100644 --- a/samples/client/petstore/java/jersey3/README.md +++ b/samples/client/petstore/java/jersey3/README.md @@ -123,6 +123,7 @@ Class | Method | HTTP request | Description *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | *FakeApi* | [**getArrayOfEnums**](docs/FakeApi.md#getArrayOfEnums) | **GET** /fake/array-of-enums | Array of Enums +*FakeApi* | [**postArrayOfString**](docs/FakeApi.md#postArrayOfString) | **POST** /fake/request-array-string | Array of string *FakeApi* | [**testAdditionalPropertiesReference**](docs/FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties *FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | diff --git a/samples/client/petstore/java/jersey3/api/openapi.yaml b/samples/client/petstore/java/jersey3/api/openapi.yaml index 07f94406542..5ba70986005 100644 --- a/samples/client/petstore/java/jersey3/api/openapi.yaml +++ b/samples/client/petstore/java/jersey3/api/openapi.yaml @@ -1193,6 +1193,25 @@ paths: tags: - fake x-accepts: application/json + /fake/request-array-string: + post: + operationId: postArrayOfString + requestBody: + content: + application/json: + schema: + items: + pattern: "[A-Z0-9]+" + type: string + type: array + responses: + "200": + description: ok + summary: Array of string + tags: + - fake + x-content-type: application/json + x-accepts: application/json components: requestBodies: UserArray: diff --git a/samples/client/petstore/java/jersey3/build.gradle b/samples/client/petstore/java/jersey3/build.gradle index 24b4f034369..67ad82be464 100644 --- a/samples/client/petstore/java/jersey3/build.gradle +++ b/samples/client/petstore/java/jersey3/build.gradle @@ -103,6 +103,7 @@ ext { jackson_databind_version = "2.13.4.2" jackson_databind_nullable_version = "0.2.6" jakarta_annotation_version = "2.1.0" + bean_validation_version = "3.0.2" jersey_version = "3.0.4" junit_version = "5.8.2" scribejava_apis_version = "8.3.1" @@ -125,6 +126,8 @@ dependencies { implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version" implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" } diff --git a/samples/client/petstore/java/jersey3/docs/ArrayTest.md b/samples/client/petstore/java/jersey3/docs/ArrayTest.md index 36077c9df30..ae2672809aa 100644 --- a/samples/client/petstore/java/jersey3/docs/ArrayTest.md +++ b/samples/client/petstore/java/jersey3/docs/ArrayTest.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**arrayOfString** | **List<String>** | | [optional] | |**arrayArrayOfInteger** | **List<List<Long>>** | | [optional] | -|**arrayArrayOfModel** | **List<List<ReadOnlyFirst>>** | | [optional] | +|**arrayArrayOfModel** | **List<List<@Valid ReadOnlyFirst>>** | | [optional] | diff --git a/samples/client/petstore/java/jersey3/docs/FakeApi.md b/samples/client/petstore/java/jersey3/docs/FakeApi.md index 567b5637ad2..7d45cd6a51b 100644 --- a/samples/client/petstore/java/jersey3/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey3/docs/FakeApi.md @@ -10,6 +10,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* | [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | | | [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | | | [**getArrayOfEnums**](FakeApi.md#getArrayOfEnums) | **GET** /fake/array-of-enums | Array of Enums | +| [**postArrayOfString**](FakeApi.md#postArrayOfString) | **POST** /fake/request-array-string | Array of string | | [**testAdditionalPropertiesReference**](FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties | | [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | | | [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | | @@ -404,6 +405,68 @@ No authorization required | **200** | Got named array of enums | - | +## postArrayOfString + +> postArrayOfString(requestBody) + +Array of string + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.model.*; +import org.openapitools.client.api.FakeApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + FakeApi apiInstance = new FakeApi(defaultClient); + List<@Pattern(regexp = "[A-Z0-9]+")String> requestBody = Arrays.asList(); // List<@Pattern(regexp = "[A-Z0-9]+")String> | + try { + apiInstance.postArrayOfString(requestBody); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#postArrayOfString"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **requestBody** | **List<String>**| | [optional] | + +### Return type + +null (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: application/json +- **Accept**: Not defined + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | ok | - | + + ## testAdditionalPropertiesReference > testAdditionalPropertiesReference(requestBody) diff --git a/samples/client/petstore/java/jersey3/docs/UserApi.md b/samples/client/petstore/java/jersey3/docs/UserApi.md index 6df604acce3..091549fc7c8 100644 --- a/samples/client/petstore/java/jersey3/docs/UserApi.md +++ b/samples/client/petstore/java/jersey3/docs/UserApi.md @@ -103,7 +103,7 @@ public class Example { defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); UserApi apiInstance = new UserApi(defaultClient); - List user = Arrays.asList(); // List | List of user object + List<@Valid User> user = Arrays.asList(); // List<@Valid User> | List of user object try { apiInstance.createUsersWithArrayInput(user); } catch (ApiException e) { @@ -167,7 +167,7 @@ public class Example { defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); UserApi apiInstance = new UserApi(defaultClient); - List user = Arrays.asList(); // List | List of user object + List<@Valid User> user = Arrays.asList(); // List<@Valid User> | List of user object try { apiInstance.createUsersWithListInput(user); } catch (ApiException e) { diff --git a/samples/client/petstore/java/jersey3/pom.xml b/samples/client/petstore/java/jersey3/pom.xml index 9ce600b7e6b..a53fe20fbe1 100644 --- a/samples/client/petstore/java/jersey3/pom.xml +++ b/samples/client/petstore/java/jersey3/pom.xml @@ -317,6 +317,13 @@ scribejava-apis ${scribejava-apis-version} + + + jakarta.validation + jakarta.validation-api + ${beanvalidation-version} + provided + jakarta.annotation jakarta.annotation-api @@ -343,6 +350,7 @@ 2.15.2 0.2.6 2.1.1 + 3.0.2 5.10.0 1.8 8.3.3 diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index fbfea8ac55e..5671f35ca56 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -10,6 +10,9 @@ import jakarta.ws.rs.core.GenericType; import org.openapitools.client.model.Client; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java index 8376bef0076..ae5e504c574 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -10,6 +10,9 @@ import jakarta.ws.rs.core.GenericType; import org.openapitools.client.model.FooGetDefaultResponse; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java index 782da5a0e51..0fec0ba81b9 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java @@ -20,6 +20,9 @@ import org.openapitools.client.model.OuterEnum; import org.openapitools.client.model.TestInlineFreeformAdditionalPropertiesRequest; import org.openapitools.client.model.User; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -268,6 +271,40 @@ public class FakeApi { new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, null, localVarReturnType, false); } + /** + * Array of string + * + * @param requestBody (optional) + * @throws ApiException if fails to make API call + * @http.response.details + + + +
Status Code Description Response Headers
200 ok -
+ */ + public void postArrayOfString(List<@Pattern(regexp = "[A-Z0-9]+")String> requestBody) throws ApiException { + postArrayOfStringWithHttpInfo(requestBody); + } + + /** + * Array of string + * + * @param requestBody (optional) + * @return ApiResponse<Void> + * @throws ApiException if fails to make API call + * @http.response.details + + + +
Status Code Description Response Headers
200 ok -
+ */ + public ApiResponse postArrayOfStringWithHttpInfo(List<@Pattern(regexp = "[A-Z0-9]+")String> requestBody) throws ApiException { + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.postArrayOfString", "/fake/request-array-string", "POST", new ArrayList<>(), requestBody, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); + } /** * test referenced additionalProperties * diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index f9e12886149..561bc6b3db6 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -10,6 +10,9 @@ import jakarta.ws.rs.core.GenericType; import org.openapitools.client.model.Client; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java index d0c9cf8f511..86eb992cd65 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/PetApi.java @@ -12,6 +12,9 @@ import java.io.File; import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java index eb334e4caf9..a86f0a12b86 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/StoreApi.java @@ -10,6 +10,9 @@ import jakarta.ws.rs.core.GenericType; import org.openapitools.client.model.Order; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java index aba61320c23..4d23b515013 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/UserApi.java @@ -11,6 +11,9 @@ import jakarta.ws.rs.core.GenericType; import java.time.OffsetDateTime; import org.openapitools.client.model.User; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -97,7 +100,7 @@ public class UserApi { 0 successful operation - */ - public void createUsersWithArrayInput(List user) throws ApiException { + public void createUsersWithArrayInput(List<@Valid User> user) throws ApiException { createUsersWithArrayInputWithHttpInfo(user); } @@ -113,7 +116,7 @@ public class UserApi { 0 successful operation - */ - public ApiResponse createUsersWithArrayInputWithHttpInfo(List user) throws ApiException { + public ApiResponse createUsersWithArrayInputWithHttpInfo(List<@Valid User> user) throws ApiException { // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithArrayInput"); @@ -136,7 +139,7 @@ public class UserApi { 0 successful operation - */ - public void createUsersWithListInput(List user) throws ApiException { + public void createUsersWithListInput(List<@Valid User> user) throws ApiException { createUsersWithListInputWithHttpInfo(user); } @@ -152,7 +155,7 @@ public class UserApi { 0 successful operation - */ - public ApiResponse createUsersWithListInputWithHttpInfo(List user) throws ApiException { + public ApiResponse createUsersWithListInputWithHttpInfo(List<@Valid User> user) throws ApiException { // Check required parameters if (user == null) { throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithListInput"); diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 13a106d1c9f..ba8424ba76f 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -29,6 +29,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -92,6 +94,7 @@ public class AdditionalPropertiesClass { * @return mapProperty **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_PROPERTY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -125,6 +128,8 @@ public class AdditionalPropertiesClass { * @return mapOfMapProperty **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -150,6 +155,7 @@ public class AdditionalPropertiesClass { * @return anytype1 **/ @jakarta.annotation.Nullable + @JsonIgnore public Object getAnytype1() { @@ -183,6 +189,7 @@ public class AdditionalPropertiesClass { * @return mapWithUndeclaredPropertiesAnytype1 **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -208,6 +215,7 @@ public class AdditionalPropertiesClass { * @return mapWithUndeclaredPropertiesAnytype2 **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -241,6 +249,7 @@ public class AdditionalPropertiesClass { * @return mapWithUndeclaredPropertiesAnytype3 **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3) @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS) @@ -266,6 +275,7 @@ public class AdditionalPropertiesClass { * @return emptyMap **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_EMPTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -299,6 +309,7 @@ public class AdditionalPropertiesClass { * @return mapWithUndeclaredPropertiesString **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java index fe59da36955..7a908adc729 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -67,6 +69,8 @@ public class Animal { * @return className **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_CLASS_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -92,6 +96,7 @@ public class Animal { * @return color **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_COLOR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java index a5a22fc5131..ca6c0c7d465 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -55,6 +57,7 @@ public class Apple { * @return cultivar **/ @jakarta.annotation.Nullable + @Pattern(regexp="^[a-zA-Z\\s]*$") @JsonProperty(JSON_PROPERTY_CULTIVAR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -80,6 +83,7 @@ public class Apple { * @return origin **/ @jakarta.annotation.Nullable + @Pattern(regexp="/^[A-Z\\s]*$/i") @JsonProperty(JSON_PROPERTY_ORIGIN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java index 458f282ffec..87c2a81816e 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -55,6 +57,8 @@ public class AppleReq { * @return cultivar **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_CULTIVAR) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -80,6 +84,7 @@ public class AppleReq { * @return mealy **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MEALY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index d098d5c109c..af494876d62 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -26,6 +26,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -61,6 +63,8 @@ public class ArrayOfArrayOfNumberOnly { * @return arrayArrayNumber **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 5a5e95ae170..6e42dc8a7eb 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -26,6 +26,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -61,6 +63,8 @@ public class ArrayOfNumberOnly { * @return arrayNumber **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java index 4906f59b726..8219a9c21b1 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -26,6 +26,8 @@ import java.util.Arrays; import java.util.List; import org.openapitools.client.model.ReadOnlyFirst; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -46,7 +48,7 @@ public class ArrayTest { private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } @@ -69,6 +71,7 @@ public class ArrayTest { * @return arrayOfString **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -102,6 +105,8 @@ public class ArrayTest { * @return arrayArrayOfInteger **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -117,12 +122,12 @@ public class ArrayTest { } - public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { + public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { this.arrayArrayOfModel = arrayArrayOfModel; return this; } - public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { + public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayOfModelItem) { if (this.arrayArrayOfModel == null) { this.arrayArrayOfModel = new ArrayList<>(); } @@ -135,17 +140,19 @@ public class ArrayTest { * @return arrayArrayOfModel **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setArrayArrayOfModel(List> arrayArrayOfModel) { + public void setArrayArrayOfModel(List> arrayArrayOfModel) { this.arrayArrayOfModel = arrayArrayOfModel; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java index 3e6e3238456..5c8e05b4f12 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.math.BigDecimal; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -52,6 +54,8 @@ public class Banana { * @return lengthCm **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_LENGTH_CM) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java index 5c48e0e95e6..e4b1f924964 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.math.BigDecimal; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -56,6 +58,9 @@ public class BananaReq { * @return lengthCm **/ @jakarta.annotation.Nonnull + @NotNull + @Valid + @JsonProperty(JSON_PROPERTY_LENGTH_CM) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -81,6 +86,7 @@ public class BananaReq { * @return sweet **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SWEET) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java index fb10b4558c4..85ac22cc678 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,8 @@ public class BasquePig { * @return className **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_CLASS_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java index 5456a49a56a..776e0e41eb9 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -70,6 +72,7 @@ public class Capitalization { * @return smallCamel **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SMALL_CAMEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -95,6 +98,7 @@ public class Capitalization { * @return capitalCamel **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -120,6 +124,7 @@ public class Capitalization { * @return smallSnake **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SMALL_SNAKE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -145,6 +150,7 @@ public class Capitalization { * @return capitalSnake **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -170,6 +176,7 @@ public class Capitalization { * @return scAETHFlowPoints **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -195,6 +202,7 @@ public class Capitalization { * @return ATT_NAME **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java index 7b187e3d87c..eb02ad45de6 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java @@ -31,6 +31,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -64,6 +66,7 @@ public class Cat extends Animal { * @return declawed **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DECLAWED) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java index a6e82213163..baf97c64c5b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -54,6 +56,7 @@ public class Category { * @return id **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -79,6 +82,8 @@ public class Category { * @return name **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java index e505e47e593..e51fd204ffd 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java @@ -33,6 +33,8 @@ import org.openapitools.client.model.ParentPet; import java.util.Set; import java.util.HashSet; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -70,6 +72,7 @@ public class ChildCat extends ParentPet { * @return name **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -103,6 +106,7 @@ public class ChildCat extends ParentPet { * @return petType **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PET_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java index e3c11a013dc..803574de5b1 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,7 @@ public class ClassModel { * @return propertyClass **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java index c050095c677..46d10c2b49c 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,7 @@ public class Client { * @return client **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CLIENT) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java index fccbaac01df..75c051be860 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -58,6 +60,8 @@ public class ComplexQuadrilateral { * @return shapeType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_SHAPE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -83,6 +87,8 @@ public class ComplexQuadrilateral { * @return quadrilateralType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java index 5c15fb58e64..0cfdf8c4da9 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,8 @@ public class DanishPig { * @return className **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_CLASS_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java index 8a11e7a95a2..ddbd5d70d41 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -52,6 +54,7 @@ public class DeprecatedObject { * @return name **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java index d6f3d4b8f0e..6b15d8db5b8 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java @@ -31,6 +31,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -64,6 +66,7 @@ public class Dog extends Animal { * @return breed **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BREED) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java index 8d80c87ae7b..c2c1e45b808 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java @@ -37,6 +37,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -76,6 +78,8 @@ public class Drawing { * @return mainShape **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_MAIN_SHAPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -101,6 +105,8 @@ public class Drawing { * @return shapeOrNull **/ @jakarta.annotation.Nullable + @Valid + @JsonIgnore public ShapeOrNull getShapeOrNull() { @@ -134,6 +140,8 @@ public class Drawing { * @return nullableShape **/ @jakarta.annotation.Nullable + @Valid + @JsonIgnore public NullableShape getNullableShape() { @@ -175,6 +183,8 @@ public class Drawing { * @return shapes **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_SHAPES) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java index 0633895619c..5e1c18da66c 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -25,6 +25,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -126,6 +128,7 @@ public class EnumArrays { * @return justSymbol **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_JUST_SYMBOL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -159,6 +162,7 @@ public class EnumArrays { * @return arrayEnum **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java index 0150ebe31b4..8896a4043cb 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java @@ -17,6 +17,8 @@ import java.util.Objects; import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java index 0d9756fb60c..ca479e1fa24 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java @@ -31,6 +31,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -270,6 +272,7 @@ public class EnumTest { * @return enumString **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -295,6 +298,8 @@ public class EnumTest { * @return enumStringRequired **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -320,6 +325,7 @@ public class EnumTest { * @return enumInteger **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ENUM_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -345,6 +351,7 @@ public class EnumTest { * @return enumIntegerOnly **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -370,6 +377,7 @@ public class EnumTest { * @return enumNumber **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ENUM_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -395,6 +403,8 @@ public class EnumTest { * @return outerEnum **/ @jakarta.annotation.Nullable + @Valid + @JsonIgnore public OuterEnum getOuterEnum() { @@ -428,6 +438,8 @@ public class EnumTest { * @return outerEnumInteger **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -453,6 +465,8 @@ public class EnumTest { * @return outerEnumDefaultValue **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -478,6 +492,8 @@ public class EnumTest { * @return outerEnumIntegerDefaultValue **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java index ca73e188521..99995843ca3 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -58,6 +60,8 @@ public class EquilateralTriangle { * @return shapeType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_SHAPE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -83,6 +87,8 @@ public class EquilateralTriangle { * @return triangleType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index b2dbe47f70c..253ab33014b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -26,6 +26,8 @@ import java.util.Arrays; import java.util.List; import org.openapitools.client.model.ModelFile; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -42,7 +44,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); public FileSchemaTestClass() { } @@ -57,6 +59,8 @@ public class FileSchemaTestClass { * @return _file **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_FILE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -72,7 +76,7 @@ public class FileSchemaTestClass { } - public FileSchemaTestClass files(List files) { + public FileSchemaTestClass files(List<@Valid ModelFile> files) { this.files = files; return this; } @@ -90,17 +94,19 @@ public class FileSchemaTestClass { * @return files **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_FILES) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } @JsonProperty(JSON_PROPERTY_FILES) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setFiles(List files) { + public void setFiles(List<@Valid ModelFile> files) { this.files = files; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java index 81dd9a33288..0ca94fe0b16 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,7 @@ public class Foo { * @return bar **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BAR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java index e1c089c3497..298627a3596 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import org.openapitools.client.model.Foo; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -52,6 +54,8 @@ public class FooGetDefaultResponse { * @return string **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java index f7915497385..e53647cd26c 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java @@ -28,6 +28,8 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -118,6 +120,7 @@ public class FormatTest { * @return integer **/ @jakarta.annotation.Nullable + @Min(10) @Max(100) @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -145,6 +148,7 @@ public class FormatTest { * @return int32 **/ @jakarta.annotation.Nullable + @Min(20) @Max(200) @JsonProperty(JSON_PROPERTY_INT32) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -170,6 +174,7 @@ public class FormatTest { * @return int64 **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_INT64) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -197,6 +202,9 @@ public class FormatTest { * @return number **/ @jakarta.annotation.Nonnull + @NotNull + @Valid + @DecimalMin("32.1") @DecimalMax("543.2") @JsonProperty(JSON_PROPERTY_NUMBER) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -224,6 +232,7 @@ public class FormatTest { * @return _float **/ @jakarta.annotation.Nullable + @DecimalMin("54.3") @DecimalMax("987.6") @JsonProperty(JSON_PROPERTY_FLOAT) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -251,6 +260,7 @@ public class FormatTest { * @return _double **/ @jakarta.annotation.Nullable + @DecimalMin("67.8") @DecimalMax("123.4") @JsonProperty(JSON_PROPERTY_DOUBLE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -276,6 +286,8 @@ public class FormatTest { * @return decimal **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_DECIMAL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -301,6 +313,7 @@ public class FormatTest { * @return string **/ @jakarta.annotation.Nullable + @Pattern(regexp="/[a-z]/i") @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -326,6 +339,8 @@ public class FormatTest { * @return _byte **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_BYTE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -351,6 +366,8 @@ public class FormatTest { * @return binary **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_BINARY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -376,6 +393,9 @@ public class FormatTest { * @return date **/ @jakarta.annotation.Nonnull + @NotNull + @Valid + @JsonProperty(JSON_PROPERTY_DATE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -401,6 +421,8 @@ public class FormatTest { * @return dateTime **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -426,6 +448,8 @@ public class FormatTest { * @return uuid **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -451,6 +475,8 @@ public class FormatTest { * @return password **/ @jakarta.annotation.Nonnull + @NotNull + @Size(min=10,max=64) @JsonProperty(JSON_PROPERTY_PASSWORD) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -476,6 +502,7 @@ public class FormatTest { * @return patternWithDigits **/ @jakarta.annotation.Nullable + @Pattern(regexp="^\\d{10}$") @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -501,6 +528,7 @@ public class FormatTest { * @return patternWithDigitsAndDelimiter **/ @jakarta.annotation.Nullable + @Pattern(regexp="/^image_\\d{1,3}$/i") @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java index c7d3531d369..8937db638d2 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java @@ -26,6 +26,8 @@ import java.util.Arrays; import org.openapitools.client.model.Apple; import org.openapitools.client.model.Banana; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java index b9411d6a0cf..85e54140a0a 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java @@ -26,6 +26,8 @@ import java.util.Arrays; import org.openapitools.client.model.AppleReq; import org.openapitools.client.model.BananaReq; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java index c5348a124ca..7c7586a4b67 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java @@ -26,6 +26,8 @@ import java.util.Arrays; import org.openapitools.client.model.Apple; import org.openapitools.client.model.Banana; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index 68764cf10a6..770dc0e4fc3 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -63,6 +65,8 @@ public class GrandparentAnimal { * @return petType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_PET_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 2bc14beaa80..b74774097f7 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -60,6 +62,7 @@ public class HasOnlyReadOnly { * @return bar **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BAR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -75,6 +78,7 @@ public class HasOnlyReadOnly { * @return foo **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOO) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java index 615836a025a..2823fe38c80 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -54,6 +56,7 @@ public class HealthCheckResult { * @return nullableMessage **/ @jakarta.annotation.Nullable + @JsonIgnore public String getNullableMessage() { diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java index 8e7358906da..c433cf572ae 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -54,6 +56,8 @@ public class IsoscelesTriangle { * @return shapeType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_SHAPE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -79,6 +83,8 @@ public class IsoscelesTriangle { * @return triangleType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java index bcc5a8c4d22..da756ecedd0 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java @@ -33,6 +33,8 @@ import org.openapitools.client.model.Pig; import org.openapitools.client.model.Whale; import org.openapitools.client.model.Zebra; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java index 2b4ee9c4f96..e107f327d75 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -107,6 +109,8 @@ public class MapTest { * @return mapMapOfString **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -140,6 +144,7 @@ public class MapTest { * @return mapOfEnumString **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -173,6 +178,7 @@ public class MapTest { * @return directMap **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -206,6 +212,7 @@ public class MapTest { * @return indirectMap **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f76a5382526..30da3dfa0b0 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -28,6 +28,8 @@ import java.util.Map; import java.util.UUID; import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -63,6 +65,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * @return uuid **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -88,6 +92,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * @return dateTime **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_DATE_TIME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -121,6 +127,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * @return map **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java index bd762e525ac..806c847891a 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -55,6 +57,7 @@ public class Model200Response { * @return name **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -80,6 +83,7 @@ public class Model200Response { * @return propertyClass **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 533505eaeb5..cfeb89c1804 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -59,6 +61,7 @@ public class ModelApiResponse { * @return code **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CODE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -84,6 +87,7 @@ public class ModelApiResponse { * @return type **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -109,6 +113,7 @@ public class ModelApiResponse { * @return message **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MESSAGE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java index a23c216ff9a..b8062f37bf5 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -51,6 +53,7 @@ public class ModelFile { * @return sourceURI **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java index db44a909f39..727dba658b7 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -51,6 +53,7 @@ public class ModelList { * @return _123list **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_123LIST) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java index f0c34fe674e..39ac590f42b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -51,6 +53,7 @@ public class ModelReturn { * @return _return **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_RETURN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java index e660324e965..d5f71019e22 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -72,6 +74,8 @@ public class Name { * @return name **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -92,6 +96,7 @@ public class Name { * @return snakeCase **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SNAKE_CASE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -112,6 +117,7 @@ public class Name { * @return property **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PROPERTY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -132,6 +138,7 @@ public class Name { * @return _123number **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_123NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java index 0c0250262b9..1ed1936a670 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java @@ -38,6 +38,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -109,6 +111,7 @@ public class NullableClass { * @return integerProp **/ @jakarta.annotation.Nullable + @JsonIgnore public Integer getIntegerProp() { @@ -142,6 +145,8 @@ public class NullableClass { * @return numberProp **/ @jakarta.annotation.Nullable + @Valid + @JsonIgnore public BigDecimal getNumberProp() { @@ -175,6 +180,7 @@ public class NullableClass { * @return booleanProp **/ @jakarta.annotation.Nullable + @JsonIgnore public Boolean getBooleanProp() { @@ -208,6 +214,7 @@ public class NullableClass { * @return stringProp **/ @jakarta.annotation.Nullable + @JsonIgnore public String getStringProp() { @@ -241,6 +248,8 @@ public class NullableClass { * @return dateProp **/ @jakarta.annotation.Nullable + @Valid + @JsonIgnore public LocalDate getDateProp() { @@ -274,6 +283,8 @@ public class NullableClass { * @return datetimeProp **/ @jakarta.annotation.Nullable + @Valid + @JsonIgnore public OffsetDateTime getDatetimeProp() { @@ -319,6 +330,7 @@ public class NullableClass { * @return arrayNullableProp **/ @jakarta.annotation.Nullable + @JsonIgnore public List getArrayNullableProp() { @@ -364,6 +376,7 @@ public class NullableClass { * @return arrayAndItemsNullableProp **/ @jakarta.annotation.Nullable + @JsonIgnore public List getArrayAndItemsNullableProp() { @@ -405,6 +418,7 @@ public class NullableClass { * @return arrayItemsNullable **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -442,6 +456,7 @@ public class NullableClass { * @return objectNullableProp **/ @jakarta.annotation.Nullable + @JsonIgnore public Map getObjectNullableProp() { @@ -487,6 +502,7 @@ public class NullableClass { * @return objectAndItemsNullableProp **/ @jakarta.annotation.Nullable + @JsonIgnore public Map getObjectAndItemsNullableProp() { @@ -528,6 +544,7 @@ public class NullableClass { * @return objectItemsNullable **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE) @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java index cd248dc0a82..d08f6d8bc59 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java @@ -32,6 +32,8 @@ import java.util.Arrays; import org.openapitools.client.model.Quadrilateral; import org.openapitools.client.model.Triangle; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java index 99c6ae9299d..6c0cadd8692 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.math.BigDecimal; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -51,6 +53,8 @@ public class NumberOnly { * @return justNumber **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_JUST_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index a29f9b9bdc5..4d39e7336a7 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -27,6 +27,8 @@ import java.util.Arrays; import java.util.List; import org.openapitools.client.model.DeprecatedObject; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -69,6 +71,7 @@ public class ObjectWithDeprecatedFields { * @return uuid **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_UUID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -97,6 +100,8 @@ public class ObjectWithDeprecatedFields { **/ @Deprecated @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -126,6 +131,8 @@ public class ObjectWithDeprecatedFields { **/ @Deprecated @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_DEPRECATED_REF) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -163,6 +170,7 @@ public class ObjectWithDeprecatedFields { **/ @Deprecated @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BARS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java index 719b402da04..b4b1d1584ae 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -108,6 +110,7 @@ public class Order { * @return id **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -133,6 +136,7 @@ public class Order { * @return petId **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PET_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -158,6 +162,7 @@ public class Order { * @return quantity **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_QUANTITY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -183,6 +188,8 @@ public class Order { * @return shipDate **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_SHIP_DATE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -208,6 +215,7 @@ public class Order { * @return status **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_STATUS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -233,6 +241,7 @@ public class Order { * @return complete **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_COMPLETE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java index 53440174a6b..5c45d5f8617 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.math.BigDecimal; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -59,6 +61,8 @@ public class OuterComposite { * @return myNumber **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_MY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -84,6 +88,7 @@ public class OuterComposite { * @return myString **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -109,6 +114,7 @@ public class OuterComposite { * @return myBoolean **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MY_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java index d50018b999d..d1406d0afca 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -17,6 +17,8 @@ import java.util.Objects; import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73020e1e3b8..e20841e97c8 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -17,6 +17,8 @@ import java.util.Objects; import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index a83925c5869..f7c3095b681 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -17,6 +17,8 @@ import java.util.Objects; import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 383ca422742..71b91d2f62b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -17,6 +17,8 @@ import java.util.Objects; import java.util.Map; import java.util.HashMap; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java index 301b1eb9877..6b2066b3459 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ParentPet.java @@ -31,6 +31,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import org.openapitools.client.model.GrandparentAnimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java index 6fb9a54e91f..da580614540 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java @@ -27,6 +27,8 @@ import java.util.List; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -56,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = new ArrayList<>(); + private List<@Valid Tag> tags = new ArrayList<>(); /** * pet status in the store @@ -111,6 +113,7 @@ public class Pet { * @return id **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -136,6 +139,8 @@ public class Pet { * @return category **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_CATEGORY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -161,6 +166,8 @@ public class Pet { * @return name **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -194,6 +201,8 @@ public class Pet { * @return photoUrls **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -209,7 +218,7 @@ public class Pet { } - public Pet tags(List tags) { + public Pet tags(List<@Valid Tag> tags) { this.tags = tags; return this; } @@ -227,17 +236,19 @@ public class Pet { * @return tags **/ @jakarta.annotation.Nullable + @Valid + @JsonProperty(JSON_PROPERTY_TAGS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getTags() { + public List<@Valid Tag> getTags() { return tags; } @JsonProperty(JSON_PROPERTY_TAGS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTags(List tags) { + public void setTags(List<@Valid Tag> tags) { this.tags = tags; } @@ -252,6 +263,7 @@ public class Pet { * @return status **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_STATUS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java index 339ed69cdf2..6914f25644c 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java @@ -32,6 +32,8 @@ import java.util.Arrays; import org.openapitools.client.model.BasquePig; import org.openapitools.client.model.DanishPig; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java index 0cce3a2ce95..de75e54bbe6 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -32,6 +32,8 @@ import java.util.Arrays; import org.openapitools.client.model.ComplexQuadrilateral; import org.openapitools.client.model.SimpleQuadrilateral; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java index ee276fb6efd..097bdd6c5fe 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,8 @@ public class QuadrilateralInterface { * @return quadrilateralType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index f381b34139a..488d214eaa9 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -57,6 +59,7 @@ public class ReadOnlyFirst { * @return bar **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BAR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -77,6 +80,7 @@ public class ReadOnlyFirst { * @return baz **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BAZ) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java index 82b323ac6e7..4be7bfb636d 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -58,6 +60,8 @@ public class ScaleneTriangle { * @return shapeType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_SHAPE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -83,6 +87,8 @@ public class ScaleneTriangle { * @return triangleType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java index 27c18173221..04b57a98c95 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java @@ -32,6 +32,8 @@ import java.util.Arrays; import org.openapitools.client.model.Quadrilateral; import org.openapitools.client.model.Triangle; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java index dfff165049c..7c38949c818 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,8 @@ public class ShapeInterface { * @return shapeType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_SHAPE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 78bed947628..3e77e29ae03 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -32,6 +32,8 @@ import java.util.Arrays; import org.openapitools.client.model.Quadrilateral; import org.openapitools.client.model.Triangle; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java index 98cc5f81309..1c27876045c 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -58,6 +60,8 @@ public class SimpleQuadrilateral { * @return shapeType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_SHAPE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) @@ -83,6 +87,8 @@ public class SimpleQuadrilateral { * @return quadrilateralType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java index 8a5b63142fa..861fb5bed00 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -55,6 +57,7 @@ public class SpecialModelName { * @return $specialPropertyName **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -80,6 +83,7 @@ public class SpecialModelName { * @return specialModelName **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SPECIAL_MODEL_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java index 8a8441a07bf..0f63a899511 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -54,6 +56,7 @@ public class Tag { * @return id **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -79,6 +82,7 @@ public class Tag { * @return name **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java index b64fa99b6f8..3d00627e927 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -55,6 +57,7 @@ public class TestInlineFreeformAdditionalPropertiesRequest { * @return someProperty **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SOME_PROPERTY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java index 3005871aed6..770a3f101a5 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java @@ -33,6 +33,8 @@ import org.openapitools.client.model.EquilateralTriangle; import org.openapitools.client.model.IsoscelesTriangle; import org.openapitools.client.model.ScaleneTriangle; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java index 5e8b3bd8099..a8448930984 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -50,6 +52,8 @@ public class TriangleInterface { * @return triangleType **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java index 0065692dd94..2f7288d4daf 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -98,6 +100,7 @@ public class User { * @return id **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -123,6 +126,7 @@ public class User { * @return username **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_USERNAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -148,6 +152,7 @@ public class User { * @return firstName **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FIRST_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -173,6 +178,7 @@ public class User { * @return lastName **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_LAST_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -198,6 +204,7 @@ public class User { * @return email **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_EMAIL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -223,6 +230,7 @@ public class User { * @return password **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PASSWORD) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -248,6 +256,7 @@ public class User { * @return phone **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PHONE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -273,6 +282,7 @@ public class User { * @return userStatus **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_USER_STATUS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -298,6 +308,7 @@ public class User { * @return objectWithNoDeclaredProps **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -323,6 +334,7 @@ public class User { * @return objectWithNoDeclaredPropsNullable **/ @jakarta.annotation.Nullable + @JsonIgnore public Object getObjectWithNoDeclaredPropsNullable() { @@ -356,6 +368,7 @@ public class User { * @return anyTypeProp **/ @jakarta.annotation.Nullable + @JsonIgnore public Object getAnyTypeProp() { @@ -389,6 +402,7 @@ public class User { * @return anyTypePropNullable **/ @jakarta.annotation.Nullable + @JsonIgnore public Object getAnyTypePropNullable() { diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java index 8d7db6c25c9..4bd97b7821d 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -59,6 +61,7 @@ public class Whale { * @return hasBaleen **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_HAS_BALEEN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -84,6 +87,7 @@ public class Whale { * @return hasTeeth **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_HAS_TEETH) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -109,6 +113,8 @@ public class Whale { * @return className **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_CLASS_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java index cdb7c61ea0c..efa2a9bcc36 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import org.openapitools.client.JSON; @@ -96,6 +98,7 @@ public class Zebra { * @return type **/ @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -121,6 +124,8 @@ public class Zebra { * @return className **/ @jakarta.annotation.Nonnull + @NotNull + @JsonProperty(JSON_PROPERTY_CLASS_NAME) @JsonInclude(value = JsonInclude.Include.ALWAYS) diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle index b112fc390a8..17f5b4a9841 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.gradle +++ b/samples/client/petstore/java/rest-assured-jackson/build.gradle @@ -116,7 +116,7 @@ dependencies { implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" implementation "com.squareup.okio:okio:$okio_version" - implementation "jakarta.validation:jakarta.validation-api:2.0.2" + implementation "jakarta.validation:jakarta.validation-api:3.0.2" implementation "org.hibernate:hibernate-validator:6.0.19.Final" implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/rest-assured-jackson/build.sbt b/samples/client/petstore/java/rest-assured-jackson/build.sbt index 7d599d4642b..e080650b9ef 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.sbt +++ b/samples/client/petstore/java/rest-assured-jackson/build.sbt @@ -19,7 +19,7 @@ lazy val root = (project in file(".")). "org.openapitools" % "jackson-databind-nullable" % "0.2.6", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.4.1", "com.squareup.okio" % "okio" % "1.17.5" % "compile", - "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile", "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.2" % "test", diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml index fd3d992cadd..c4d0f4a60f3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/pom.xml +++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml @@ -285,7 +285,7 @@ 2.15.2 0.2.6 1.3.5 - 2.0.2 + 3.0.2 3.6.0 4.13.2 diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle index d0fc73dd343..b81ff3e04bb 100644 --- a/samples/client/petstore/java/rest-assured/build.gradle +++ b/samples/client/petstore/java/rest-assured/build.gradle @@ -110,7 +110,7 @@ dependencies { implementation "io.gsonfire:gson-fire:$gson_fire_version" implementation 'com.google.code.gson:gson:$gson_version' implementation "com.squareup.okio:okio:$okio_version" - implementation "jakarta.validation:jakarta.validation-api:2.0.2" + implementation "jakarta.validation:jakarta.validation-api:3.0.2" implementation "org.hibernate:hibernate-validator:6.0.19.Final" implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" testImplementation "junit:junit:$junit_version" diff --git a/samples/client/petstore/java/rest-assured/build.sbt b/samples/client/petstore/java/rest-assured/build.sbt index a82aa7da30b..bc19cbe3820 100644 --- a/samples/client/petstore/java/rest-assured/build.sbt +++ b/samples/client/petstore/java/rest-assured/build.sbt @@ -16,7 +16,7 @@ lazy val root = (project in file(".")). "com.google.code.gson" % "gson" % "2.8.9", "io.gsonfire" % "gson-fire" % "1.9.0" % "compile", "com.squareup.okio" % "okio" % "1.17.5" % "compile", - "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile", "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "junit" % "junit" % "4.13.2" % "test", diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml index 066e10e5e67..9f03caa4435 100644 --- a/samples/client/petstore/java/rest-assured/pom.xml +++ b/samples/client/petstore/java/rest-assured/pom.xml @@ -264,7 +264,7 @@ 1.9.0 2.15.2 1.3.5 - 2.0.2 + 3.0.2 3.6.0 4.13.2 diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle index c6161553724..a4f265e9d33 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.gradle +++ b/samples/client/petstore/java/retrofit2-play26/build.gradle @@ -121,7 +121,7 @@ dependencies { } implementation "io.gsonfire:gson-fire:$json_fire_version" implementation "com.typesafe.play:play-ahc-ws_2.12:$play_version" - implementation "jakarta.validation:jakarta.validation-api:2.0.2" + implementation "jakarta.validation:jakarta.validation-api:3.0.2" implementation "com.squareup.retrofit2:converter-jackson:$retrofit_version" implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt index f4f37c3c94d..2a44d0945e8 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.sbt +++ b/samples/client/petstore/java/retrofit2-play26/build.sbt @@ -12,7 +12,7 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", - "jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile", + "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.15.2" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.15.2" % "compile", diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index fe15d398ed5..8558664160c 100644 --- a/samples/client/petstore/java/retrofit2-play26/pom.xml +++ b/samples/client/petstore/java/retrofit2-play26/pom.xml @@ -303,8 +303,8 @@ 2.1.1 2.6.7 2.5.0 - 1.3.5 - 2.0.2 + 2.1.1 + 3.0.2 1.0.1 4.13.2 diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java index 6ebc59bfac4..67b6b132e3f 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Pair.java @@ -13,7 +13,7 @@ package org.openapitools.client; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Pair { private String name = ""; private String value = ""; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java index b7e3bbe380b..9d5432a159e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/StringUtil.java @@ -16,7 +16,7 @@ package org.openapitools.client; import java.util.Collection; import java.util.Iterator; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 05c24d6bdb5..7a7b7a2b7d0 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -12,8 +12,8 @@ import okhttp3.MultipartBody; import org.openapitools.client.model.Client; import java.util.UUID; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java index 3f72d5f3c63..43c1db6acd0 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java @@ -19,8 +19,8 @@ import org.openapitools.client.model.OuterComposite; import org.openapitools.client.model.User; import org.openapitools.client.model.XmlItem; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 8eda86928f5..9701c972bca 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -11,8 +11,8 @@ import okhttp3.MultipartBody; import org.openapitools.client.model.Client; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java index b6814c9e916..0de01cfd445 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java @@ -14,8 +14,8 @@ import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java index 9904c1fb871..495f2f0d9df 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/StoreApi.java @@ -11,8 +11,8 @@ import okhttp3.MultipartBody; import org.openapitools.client.model.Order; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/UserApi.java index e28e7e4f3d4..debee0813c1 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/UserApi.java @@ -12,8 +12,8 @@ import okhttp3.MultipartBody; import java.time.OffsetDateTime; import org.openapitools.client.model.User; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import java.util.ArrayList; import java.util.HashMap; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java index 3b65a921e1e..6b38de02d77 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -21,7 +21,7 @@ import java.util.List; /** * Holds ApiKey auth info */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ApiKeyAuth implements Authentication { private final String location; private final String paramName; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 2a856651218..bcab07d2389 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesAnyType @@ -33,7 +33,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ AdditionalPropertiesAnyType.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesAnyType extends HashMap { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -52,7 +52,7 @@ public class AdditionalPropertiesAnyType extends HashMap { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 2c34f565fec..06ac46abe70 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesArray @@ -34,7 +34,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ AdditionalPropertiesArray.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesArray extends HashMap { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -53,7 +53,7 @@ public class AdditionalPropertiesArray extends HashMap { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 501a770c37e..de504b0f662 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesBoolean @@ -33,7 +33,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ AdditionalPropertiesBoolean.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesBoolean extends HashMap { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -52,7 +52,7 @@ public class AdditionalPropertiesBoolean extends HashMap { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index e43e5d7883e..e8e6d79e390 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesClass @@ -45,7 +45,7 @@ import javax.validation.Valid; AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2, AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3 }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; private Map mapString = new HashMap<>(); @@ -101,7 +101,7 @@ public class AdditionalPropertiesClass { * Get mapString * @return mapString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -136,7 +136,7 @@ public class AdditionalPropertiesClass { * Get mapNumber * @return mapNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MAP_NUMBER) @@ -172,7 +172,7 @@ public class AdditionalPropertiesClass { * Get mapInteger * @return mapInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -207,7 +207,7 @@ public class AdditionalPropertiesClass { * Get mapBoolean * @return mapBoolean **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -242,7 +242,7 @@ public class AdditionalPropertiesClass { * Get mapArrayInteger * @return mapArrayInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) @@ -278,7 +278,7 @@ public class AdditionalPropertiesClass { * Get mapArrayAnytype * @return mapArrayAnytype **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) @@ -314,7 +314,7 @@ public class AdditionalPropertiesClass { * Get mapMapString * @return mapMapString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) @@ -350,7 +350,7 @@ public class AdditionalPropertiesClass { * Get mapMapAnytype * @return mapMapAnytype **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) @@ -378,7 +378,7 @@ public class AdditionalPropertiesClass { * Get anytype1 * @return anytype1 **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ANYTYPE1) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -405,7 +405,7 @@ public class AdditionalPropertiesClass { * Get anytype2 * @return anytype2 **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ANYTYPE2) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -432,7 +432,7 @@ public class AdditionalPropertiesClass { * Get anytype3 * @return anytype3 **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ANYTYPE3) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 923242e41a2..2671a27063e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesInteger @@ -33,7 +33,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ AdditionalPropertiesInteger.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesInteger extends HashMap { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -52,7 +52,7 @@ public class AdditionalPropertiesInteger extends HashMap { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 86310c93ec8..15ce80dcae0 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesNumber @@ -34,7 +34,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ AdditionalPropertiesNumber.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesNumber extends HashMap { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -53,7 +53,7 @@ public class AdditionalPropertiesNumber extends HashMap { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index bcd758780c4..a115684bd17 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesObject @@ -33,7 +33,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ AdditionalPropertiesObject.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesObject extends HashMap { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -52,7 +52,7 @@ public class AdditionalPropertiesObject extends HashMap { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index d1a17013b2b..ba6d2800ac1 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * AdditionalPropertiesString @@ -33,7 +33,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ AdditionalPropertiesString.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class AdditionalPropertiesString extends HashMap { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -52,7 +52,7 @@ public class AdditionalPropertiesString extends HashMap { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java index 06188e64057..600600c60c4 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java @@ -25,8 +25,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Animal @@ -35,7 +35,7 @@ import javax.validation.Valid; Animal.JSON_PROPERTY_CLASS_NAME, Animal.JSON_PROPERTY_COLOR }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") @JsonIgnoreProperties( value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization allowSetters = true // allows the className to be set during deserialization @@ -67,7 +67,7 @@ public class Animal { * Get className * @return className **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_CLASS_NAME) @@ -95,7 +95,7 @@ public class Animal { * Get color * @return color **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_COLOR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 6e049dcf798..35c59478f37 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * ArrayOfArrayOfNumberOnly @@ -35,7 +35,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; private List> arrayArrayNumber = new ArrayList<>(); @@ -61,7 +61,7 @@ public class ArrayOfArrayOfNumberOnly { * Get arrayArrayNumber * @return arrayArrayNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 53c2147b1ff..5541ebd5f77 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * ArrayOfNumberOnly @@ -35,7 +35,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; private List arrayNumber = new ArrayList<>(); @@ -61,7 +61,7 @@ public class ArrayOfNumberOnly { * Get arrayNumber * @return arrayNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java index 2246f98cf06..3d5d2e8a003 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -26,8 +26,8 @@ import java.util.List; import org.openapitools.client.model.ReadOnlyFirst; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * ArrayTest @@ -37,7 +37,7 @@ import javax.validation.Valid; ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER, ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; private List arrayOfString = new ArrayList<>(); @@ -69,7 +69,7 @@ public class ArrayTest { * Get arrayOfString * @return arrayOfString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -104,7 +104,7 @@ public class ArrayTest { * Get arrayArrayOfInteger * @return arrayArrayOfInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) @@ -140,7 +140,7 @@ public class ArrayTest { * Get arrayArrayOfModel * @return arrayArrayOfModel **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java index 5f9ea549ccc..2f3fbb1dfd6 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java @@ -26,8 +26,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Cat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * BigCat @@ -35,7 +35,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ BigCat.JSON_PROPERTY_KIND }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") @JsonIgnoreProperties( value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization allowSetters = true // allows the className to be set during deserialization @@ -99,7 +99,7 @@ public class BigCat extends Cat { * Get kind * @return kind **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_KIND) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java index 6a64b8d4007..fb7c772b74a 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Capitalization @@ -36,7 +36,7 @@ import javax.validation.Valid; Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS, Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Capitalization { public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel"; private String smallCamel; @@ -69,7 +69,7 @@ public class Capitalization { * Get smallCamel * @return smallCamel **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_SMALL_CAMEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -96,7 +96,7 @@ public class Capitalization { * Get capitalCamel * @return capitalCamel **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -123,7 +123,7 @@ public class Capitalization { * Get smallSnake * @return smallSnake **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_SMALL_SNAKE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -150,7 +150,7 @@ public class Capitalization { * Get capitalSnake * @return capitalSnake **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -177,7 +177,7 @@ public class Capitalization { * Get scAETHFlowPoints * @return scAETHFlowPoints **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -204,7 +204,7 @@ public class Capitalization { * Name of the pet * @return ATT_NAME **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java index ecbedfb692a..cf775e29640 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java @@ -26,8 +26,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Cat @@ -35,7 +35,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ Cat.JSON_PROPERTY_DECLAWED }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") @JsonIgnoreProperties( value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization allowSetters = true // allows the className to be set during deserialization @@ -63,7 +63,7 @@ public class Cat extends Animal { * Get declawed * @return declawed **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_DECLAWED) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java index 6203cfbf612..80f3a1ff869 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Category @@ -32,7 +32,7 @@ import javax.validation.Valid; Category.JSON_PROPERTY_ID, Category.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Category { public static final String JSON_PROPERTY_ID = "id"; private Long id; @@ -53,7 +53,7 @@ public class Category { * Get id * @return id **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -80,7 +80,7 @@ public class Category { * Get name * @return name **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_NAME) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java index da816d802b4..3a5f573bfd4 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Model for testing model with \"_class\" property @@ -31,7 +31,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ ClassModel.JSON_PROPERTY_PROPERTY_CLASS }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ClassModel { public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class"; private String propertyClass; @@ -49,7 +49,7 @@ public class ClassModel { * Get propertyClass * @return propertyClass **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java index 8d07ea02c29..daf54157098 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Client @@ -31,7 +31,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ Client.JSON_PROPERTY_CLIENT }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Client { public static final String JSON_PROPERTY_CLIENT = "client"; private String client; @@ -49,7 +49,7 @@ public class Client { * Get client * @return client **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_CLIENT) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java index 8c18286e430..8fc3567fd0e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java @@ -26,8 +26,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Dog @@ -35,7 +35,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ Dog.JSON_PROPERTY_BREED }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") @JsonIgnoreProperties( value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization allowSetters = true // allows the className to be set during deserialization @@ -60,7 +60,7 @@ public class Dog extends Animal { * Get breed * @return breed **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_BREED) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java index fd47809aaef..4557d08eed7 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * EnumArrays @@ -35,7 +35,7 @@ import javax.validation.Valid; EnumArrays.JSON_PROPERTY_JUST_SYMBOL, EnumArrays.JSON_PROPERTY_ARRAY_ENUM }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class EnumArrays { /** * Gets or Sets justSymbol @@ -126,7 +126,7 @@ public class EnumArrays { * Get justSymbol * @return justSymbol **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_JUST_SYMBOL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -161,7 +161,7 @@ public class EnumArrays { * Get arrayEnum * @return arrayEnum **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java index 0ad17857829..2338be6dabe 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java @@ -17,8 +17,8 @@ import java.util.Objects; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java index 6aed572ba36..e82d974b52e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java @@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.client.model.OuterEnum; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * EnumTest @@ -37,7 +37,7 @@ import javax.validation.Valid; EnumTest.JSON_PROPERTY_OUTER_ENUM }) @JsonTypeName("Enum_Test") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class EnumTest { /** * Gets or Sets enumString @@ -211,7 +211,7 @@ public class EnumTest { * Get enumString * @return enumString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -238,7 +238,7 @@ public class EnumTest { * Get enumStringRequired * @return enumStringRequired **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED) @@ -266,7 +266,7 @@ public class EnumTest { * Get enumInteger * @return enumInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ENUM_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -293,7 +293,7 @@ public class EnumTest { * Get enumNumber * @return enumNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ENUM_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -320,7 +320,7 @@ public class EnumTest { * Get outerEnum * @return outerEnum **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_OUTER_ENUM) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index f656e826e67..2c44f160af0 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -26,8 +26,8 @@ import java.util.List; import org.openapitools.client.model.ModelFile; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * FileSchemaTestClass @@ -36,7 +36,7 @@ import javax.validation.Valid; FileSchemaTestClass.JSON_PROPERTY_FILE, FileSchemaTestClass.JSON_PROPERTY_FILES }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FileSchemaTestClass { public static final String JSON_PROPERTY_FILE = "file"; private ModelFile _file; @@ -57,7 +57,7 @@ public class FileSchemaTestClass { * Get _file * @return _file **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_FILE) @@ -93,7 +93,7 @@ public class FileSchemaTestClass { * Get files * @return files **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_FILES) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java index 941f1c3cd71..0e14e3bd522 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java @@ -27,8 +27,8 @@ import java.time.OffsetDateTime; import java.util.UUID; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * FormatTest @@ -50,7 +50,7 @@ import javax.validation.Valid; FormatTest.JSON_PROPERTY_BIG_DECIMAL }) @JsonTypeName("format_test") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class FormatTest { public static final String JSON_PROPERTY_INTEGER = "integer"; private Integer integer; @@ -109,7 +109,7 @@ public class FormatTest { * maximum: 100 * @return integer **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Min(10) @Max(100) @JsonProperty(JSON_PROPERTY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -138,7 +138,7 @@ public class FormatTest { * maximum: 200 * @return int32 **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Min(20) @Max(200) @JsonProperty(JSON_PROPERTY_INT32) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -165,7 +165,7 @@ public class FormatTest { * Get int64 * @return int64 **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_INT64) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -194,7 +194,7 @@ public class FormatTest { * maximum: 543.2 * @return number **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") @@ -225,7 +225,7 @@ public class FormatTest { * maximum: 987.6 * @return _float **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @DecimalMin("54.3") @DecimalMax("987.6") @JsonProperty(JSON_PROPERTY_FLOAT) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -254,7 +254,7 @@ public class FormatTest { * maximum: 123.4 * @return _double **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @DecimalMin("67.8") @DecimalMax("123.4") @JsonProperty(JSON_PROPERTY_DOUBLE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -281,7 +281,7 @@ public class FormatTest { * Get string * @return string **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Pattern(regexp="/[a-z]/i") @JsonProperty(JSON_PROPERTY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -308,7 +308,7 @@ public class FormatTest { * Get _byte * @return _byte **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_BYTE) @@ -336,7 +336,7 @@ public class FormatTest { * Get binary * @return binary **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_BINARY) @@ -364,7 +364,7 @@ public class FormatTest { * Get date * @return date **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @Valid @@ -393,7 +393,7 @@ public class FormatTest { * Get dateTime * @return dateTime **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_DATE_TIME) @@ -421,7 +421,7 @@ public class FormatTest { * Get uuid * @return uuid **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_UUID) @@ -449,7 +449,7 @@ public class FormatTest { * Get password * @return password **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @Size(min=10,max=64) @JsonProperty(JSON_PROPERTY_PASSWORD) @@ -477,7 +477,7 @@ public class FormatTest { * Get bigDecimal * @return bigDecimal **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_BIG_DECIMAL) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index de2f577b9c3..718954df8d3 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * HasOnlyReadOnly @@ -33,7 +33,7 @@ import javax.validation.Valid; HasOnlyReadOnly.JSON_PROPERTY_FOO }) @JsonTypeName("hasOnlyReadOnly") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class HasOnlyReadOnly { public static final String JSON_PROPERTY_BAR = "bar"; private String bar; @@ -58,7 +58,7 @@ public class HasOnlyReadOnly { * Get bar * @return bar **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_BAR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -74,7 +74,7 @@ public class HasOnlyReadOnly { * Get foo * @return foo **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_FOO) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java index a3764535582..1e57ff328d1 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * MapTest @@ -36,7 +36,7 @@ import javax.validation.Valid; MapTest.JSON_PROPERTY_DIRECT_MAP, MapTest.JSON_PROPERTY_INDIRECT_MAP }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; private Map> mapMapOfString = new HashMap<>(); @@ -106,7 +106,7 @@ public class MapTest { * Get mapMapOfString * @return mapMapOfString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) @@ -142,7 +142,7 @@ public class MapTest { * Get mapOfEnumString * @return mapOfEnumString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -177,7 +177,7 @@ public class MapTest { * Get directMap * @return directMap **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_DIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -212,7 +212,7 @@ public class MapTest { * Get indirectMap * @return indirectMap **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7c847f2a705..bdb4915f009 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,8 +27,8 @@ import java.util.UUID; import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * MixedPropertiesAndAdditionalPropertiesClass @@ -38,7 +38,7 @@ import javax.validation.Valid; MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME, MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_UUID = "uuid"; private UUID uuid; @@ -62,7 +62,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * Get uuid * @return uuid **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_UUID) @@ -90,7 +90,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * Get dateTime * @return dateTime **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_DATE_TIME) @@ -126,7 +126,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * Get map * @return map **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MAP) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java index bd19821d46b..4bdc1fc69e3 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Model for testing model name starting with number @@ -33,7 +33,7 @@ import javax.validation.Valid; Model200Response.JSON_PROPERTY_PROPERTY_CLASS }) @JsonTypeName("200_response") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Model200Response { public static final String JSON_PROPERTY_NAME = "name"; private Integer name; @@ -54,7 +54,7 @@ public class Model200Response { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -81,7 +81,7 @@ public class Model200Response { * Get propertyClass * @return propertyClass **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java index c96a521a2db..9dc19ac60ef 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * ModelApiResponse @@ -34,7 +34,7 @@ import javax.validation.Valid; ModelApiResponse.JSON_PROPERTY_MESSAGE }) @JsonTypeName("ApiResponse") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelApiResponse { public static final String JSON_PROPERTY_CODE = "code"; private Integer code; @@ -58,7 +58,7 @@ public class ModelApiResponse { * Get code * @return code **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_CODE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -85,7 +85,7 @@ public class ModelApiResponse { * Get type * @return type **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_TYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -112,7 +112,7 @@ public class ModelApiResponse { * Get message * @return message **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MESSAGE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java index 5c26ff7d48f..54b045aafc9 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Must be named `File` for test. @@ -32,7 +32,7 @@ import javax.validation.Valid; ModelFile.JSON_PROPERTY_SOURCE_U_R_I }) @JsonTypeName("File") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelFile { public static final String JSON_PROPERTY_SOURCE_U_R_I = "sourceURI"; private String sourceURI; @@ -50,7 +50,7 @@ public class ModelFile { * Test capitalization * @return sourceURI **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java index ca825ecbfeb..e6385da21cf 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * ModelList @@ -32,7 +32,7 @@ import javax.validation.Valid; ModelList.JSON_PROPERTY_123LIST }) @JsonTypeName("List") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelList { public static final String JSON_PROPERTY_123LIST = "123-list"; private String _123list; @@ -50,7 +50,7 @@ public class ModelList { * Get _123list * @return _123list **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_123LIST) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java index 0fc694c21d9..374505d7973 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Model for testing reserved words @@ -32,7 +32,7 @@ import javax.validation.Valid; ModelReturn.JSON_PROPERTY_RETURN }) @JsonTypeName("Return") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ModelReturn { public static final String JSON_PROPERTY_RETURN = "return"; private Integer _return; @@ -50,7 +50,7 @@ public class ModelReturn { * Get _return * @return _return **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_RETURN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java index 4614f5a64d4..65456a63b63 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Model for testing model name same as property name @@ -34,7 +34,7 @@ import javax.validation.Valid; Name.JSON_PROPERTY_PROPERTY, Name.JSON_PROPERTY_123NUMBER }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Name { public static final String JSON_PROPERTY_NAME = "name"; private Integer name; @@ -71,7 +71,7 @@ public class Name { * Get name * @return name **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_NAME) @@ -93,7 +93,7 @@ public class Name { * Get snakeCase * @return snakeCase **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_SNAKE_CASE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -115,7 +115,7 @@ public class Name { * Get property * @return property **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PROPERTY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -136,7 +136,7 @@ public class Name { * Get _123number * @return _123number **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_123NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java index 3354af74f7e..c806ea5414b 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * NumberOnly @@ -32,7 +32,7 @@ import javax.validation.Valid; @JsonPropertyOrder({ NumberOnly.JSON_PROPERTY_JUST_NUMBER }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class NumberOnly { public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber"; private BigDecimal justNumber; @@ -50,7 +50,7 @@ public class NumberOnly { * Get justNumber * @return justNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_JUST_NUMBER) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java index 987cd00bc01..a31ac84a998 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java @@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Order @@ -37,7 +37,7 @@ import javax.validation.Valid; Order.JSON_PROPERTY_STATUS, Order.JSON_PROPERTY_COMPLETE }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Order { public static final String JSON_PROPERTY_ID = "id"; private Long id; @@ -107,7 +107,7 @@ public class Order { * Get id * @return id **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -134,7 +134,7 @@ public class Order { * Get petId * @return petId **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PET_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -161,7 +161,7 @@ public class Order { * Get quantity * @return quantity **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_QUANTITY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -188,7 +188,7 @@ public class Order { * Get shipDate * @return shipDate **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_SHIP_DATE) @@ -216,7 +216,7 @@ public class Order { * Order Status * @return status **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_STATUS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -243,7 +243,7 @@ public class Order { * Get complete * @return complete **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_COMPLETE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java index 96901e7261b..8a90f121266 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * OuterComposite @@ -34,7 +34,7 @@ import javax.validation.Valid; OuterComposite.JSON_PROPERTY_MY_STRING, OuterComposite.JSON_PROPERTY_MY_BOOLEAN }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class OuterComposite { public static final String JSON_PROPERTY_MY_NUMBER = "my_number"; private BigDecimal myNumber; @@ -58,7 +58,7 @@ public class OuterComposite { * Get myNumber * @return myNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_MY_NUMBER) @@ -86,7 +86,7 @@ public class OuterComposite { * Get myString * @return myString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MY_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -113,7 +113,7 @@ public class OuterComposite { * Get myBoolean * @return myBoolean **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_MY_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java index 6986680d3c1..37762ab1d6c 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -17,8 +17,8 @@ import java.util.Objects; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java index 11db4a917ca..efd41e3946f 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java @@ -30,8 +30,8 @@ import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Pet @@ -44,7 +44,7 @@ import javax.validation.Valid; Pet.JSON_PROPERTY_TAGS, Pet.JSON_PROPERTY_STATUS }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Pet { public static final String JSON_PROPERTY_ID = "id"; private Long id; @@ -114,7 +114,7 @@ public class Pet { * Get id * @return id **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -141,7 +141,7 @@ public class Pet { * Get category * @return category **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_CATEGORY) @@ -169,7 +169,7 @@ public class Pet { * Get name * @return name **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_NAME) @@ -205,7 +205,7 @@ public class Pet { * Get photoUrls * @return photoUrls **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @@ -242,7 +242,7 @@ public class Pet { * Get tags * @return tags **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_TAGS) @@ -270,7 +270,7 @@ public class Pet { * pet status in the store * @return status **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_STATUS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index c17666940f1..a12e1513a8c 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * ReadOnlyFirst @@ -32,7 +32,7 @@ import javax.validation.Valid; ReadOnlyFirst.JSON_PROPERTY_BAR, ReadOnlyFirst.JSON_PROPERTY_BAZ }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class ReadOnlyFirst { public static final String JSON_PROPERTY_BAR = "bar"; private String bar; @@ -55,7 +55,7 @@ public class ReadOnlyFirst { * Get bar * @return bar **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_BAR) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -77,7 +77,7 @@ public class ReadOnlyFirst { * Get baz * @return baz **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_BAZ) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java index b9133b78ed6..947ee771d3b 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * SpecialModelName @@ -32,7 +32,7 @@ import javax.validation.Valid; SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME }) @JsonTypeName("$special[model.name]") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class SpecialModelName { public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]"; private Long $specialPropertyName; @@ -50,7 +50,7 @@ public class SpecialModelName { * Get $specialPropertyName * @return $specialPropertyName **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java index 81e68a8ddc7..09dcd63b9e7 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * Tag @@ -32,7 +32,7 @@ import javax.validation.Valid; Tag.JSON_PROPERTY_ID, Tag.JSON_PROPERTY_NAME }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class Tag { public static final String JSON_PROPERTY_ID = "id"; private Long id; @@ -53,7 +53,7 @@ public class Tag { * Get id * @return id **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -80,7 +80,7 @@ public class Tag { * Get name * @return name **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index baa1f7fcf56..41ab674825b 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * TypeHolderDefault @@ -39,7 +39,7 @@ import javax.validation.Valid; TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM, TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderDefault { public static final String JSON_PROPERTY_STRING_ITEM = "string_item"; private String stringItem = "what"; @@ -69,7 +69,7 @@ public class TypeHolderDefault { * Get stringItem * @return stringItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_STRING_ITEM) @@ -97,7 +97,7 @@ public class TypeHolderDefault { * Get numberItem * @return numberItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @Valid @@ -126,7 +126,7 @@ public class TypeHolderDefault { * Get integerItem * @return integerItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_INTEGER_ITEM) @@ -154,7 +154,7 @@ public class TypeHolderDefault { * Get boolItem * @return boolItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_BOOL_ITEM) @@ -190,7 +190,7 @@ public class TypeHolderDefault { * Get arrayItem * @return arrayItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 4a207a24fa7..5ec05261802 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * TypeHolderExample @@ -40,7 +40,7 @@ import javax.validation.Valid; TypeHolderExample.JSON_PROPERTY_BOOL_ITEM, TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class TypeHolderExample { public static final String JSON_PROPERTY_STRING_ITEM = "string_item"; private String stringItem; @@ -73,7 +73,7 @@ public class TypeHolderExample { * Get stringItem * @return stringItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_STRING_ITEM) @@ -101,7 +101,7 @@ public class TypeHolderExample { * Get numberItem * @return numberItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @Valid @@ -130,7 +130,7 @@ public class TypeHolderExample { * Get floatItem * @return floatItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_FLOAT_ITEM) @@ -158,7 +158,7 @@ public class TypeHolderExample { * Get integerItem * @return integerItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_INTEGER_ITEM) @@ -186,7 +186,7 @@ public class TypeHolderExample { * Get boolItem * @return boolItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_BOOL_ITEM) @@ -222,7 +222,7 @@ public class TypeHolderExample { * Get arrayItem * @return arrayItem **/ - @javax.annotation.Nonnull + @jakarta.annotation.Nonnull @NotNull @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java index ae538f284a0..1f74327455b 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * User @@ -38,7 +38,7 @@ import javax.validation.Valid; User.JSON_PROPERTY_PHONE, User.JSON_PROPERTY_USER_STATUS }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class User { public static final String JSON_PROPERTY_ID = "id"; private Long id; @@ -77,7 +77,7 @@ public class User { * Get id * @return id **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -104,7 +104,7 @@ public class User { * Get username * @return username **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_USERNAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -131,7 +131,7 @@ public class User { * Get firstName * @return firstName **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_FIRST_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -158,7 +158,7 @@ public class User { * Get lastName * @return lastName **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_LAST_NAME) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -185,7 +185,7 @@ public class User { * Get email * @return email **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_EMAIL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -212,7 +212,7 @@ public class User { * Get password * @return password **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PASSWORD) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -239,7 +239,7 @@ public class User { * Get phone * @return phone **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PHONE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -266,7 +266,7 @@ public class User { * User Status * @return userStatus **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_USER_STATUS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java index 1880199692e..1e86bb0a601 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import javax.validation.constraints.*; -import javax.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.validation.Valid; /** * XmlItem @@ -63,7 +63,7 @@ import javax.validation.Valid; XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY, XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY }) -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.5.0-SNAPSHOT") public class XmlItem { public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string"; private String attributeString; @@ -165,7 +165,7 @@ public class XmlItem { * Get attributeString * @return attributeString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -192,7 +192,7 @@ public class XmlItem { * Get attributeNumber * @return attributeNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER) @@ -220,7 +220,7 @@ public class XmlItem { * Get attributeInteger * @return attributeInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -247,7 +247,7 @@ public class XmlItem { * Get attributeBoolean * @return attributeBoolean **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -282,7 +282,7 @@ public class XmlItem { * Get wrappedArray * @return wrappedArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -309,7 +309,7 @@ public class XmlItem { * Get nameString * @return nameString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -336,7 +336,7 @@ public class XmlItem { * Get nameNumber * @return nameNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_NAME_NUMBER) @@ -364,7 +364,7 @@ public class XmlItem { * Get nameInteger * @return nameInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -391,7 +391,7 @@ public class XmlItem { * Get nameBoolean * @return nameBoolean **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -426,7 +426,7 @@ public class XmlItem { * Get nameArray * @return nameArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -461,7 +461,7 @@ public class XmlItem { * Get nameWrappedArray * @return nameWrappedArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -488,7 +488,7 @@ public class XmlItem { * Get prefixString * @return prefixString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -515,7 +515,7 @@ public class XmlItem { * Get prefixNumber * @return prefixNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER) @@ -543,7 +543,7 @@ public class XmlItem { * Get prefixInteger * @return prefixInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -570,7 +570,7 @@ public class XmlItem { * Get prefixBoolean * @return prefixBoolean **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -605,7 +605,7 @@ public class XmlItem { * Get prefixArray * @return prefixArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -640,7 +640,7 @@ public class XmlItem { * Get prefixWrappedArray * @return prefixWrappedArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -667,7 +667,7 @@ public class XmlItem { * Get namespaceString * @return namespaceString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -694,7 +694,7 @@ public class XmlItem { * Get namespaceNumber * @return namespaceNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER) @@ -722,7 +722,7 @@ public class XmlItem { * Get namespaceInteger * @return namespaceInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -749,7 +749,7 @@ public class XmlItem { * Get namespaceBoolean * @return namespaceBoolean **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -784,7 +784,7 @@ public class XmlItem { * Get namespaceArray * @return namespaceArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -819,7 +819,7 @@ public class XmlItem { * Get namespaceWrappedArray * @return namespaceWrappedArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -846,7 +846,7 @@ public class XmlItem { * Get prefixNsString * @return prefixNsString **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -873,7 +873,7 @@ public class XmlItem { * Get prefixNsNumber * @return prefixNsNumber **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @Valid @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER) @@ -901,7 +901,7 @@ public class XmlItem { * Get prefixNsInteger * @return prefixNsInteger **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -928,7 +928,7 @@ public class XmlItem { * Get prefixNsBoolean * @return prefixNsBoolean **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -963,7 +963,7 @@ public class XmlItem { * Get prefixNsArray * @return prefixNsArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -998,7 +998,7 @@ public class XmlItem { * Get prefixNsWrappedArray * @return prefixNsWrappedArray **/ - @javax.annotation.Nullable + @jakarta.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts index c99c97bff09..2d63feaab3a 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts @@ -2101,6 +2101,40 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) options: localVarRequestOptions, }; }, + /** + * + * @summary Array of string + * @param {Array} [requestBody] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + postArrayOfString: async (requestBody?: Array, options: RawAxiosRequestConfig = {}): Promise => { + const localVarPath = `/fake/request-array-string`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(requestBody, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, /** * * @summary test referenced additionalProperties @@ -2817,6 +2851,19 @@ export const FakeApiFp = function(configuration?: Configuration) { const localVarOperationServerBasePath = operationServerMap['FakeApi.getArrayOfEnums']?.[localVarOperationServerIndex]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); }, + /** + * + * @summary Array of string + * @param {Array} [requestBody] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async postArrayOfString(requestBody?: Array, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.postArrayOfString(requestBody, options); + const localVarOperationServerIndex = configuration?.serverIndex ?? 0; + const localVarOperationServerBasePath = operationServerMap['FakeApi.postArrayOfString']?.[localVarOperationServerIndex]?.url; + return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); + }, /** * * @summary test referenced additionalProperties @@ -3065,6 +3112,16 @@ export const FakeApiFactory = function (configuration?: Configuration, basePath? getArrayOfEnums(options?: any): AxiosPromise> { return localVarFp.getArrayOfEnums(options).then((request) => request(axios, basePath)); }, + /** + * + * @summary Array of string + * @param {Array} [requestBody] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + postArrayOfString(requestBody?: Array, options?: any): AxiosPromise { + return localVarFp.postArrayOfString(requestBody, options).then((request) => request(axios, basePath)); + }, /** * * @summary test referenced additionalProperties @@ -3289,6 +3346,18 @@ export class FakeApi extends BaseAPI { return FakeApiFp(this.configuration).getArrayOfEnums(options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @summary Array of string + * @param {Array} [requestBody] + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof FakeApi + */ + public postArrayOfString(requestBody?: Array, options?: RawAxiosRequestConfig) { + return FakeApiFp(this.configuration).postArrayOfString(requestBody, options).then((request) => request(this.axios, this.basePath)); + } + /** * * @summary test referenced additionalProperties diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/README.md b/samples/openapi3/client/petstore/java/jersey2-java8/README.md index 2a0ba98c16b..633b12e83f0 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/README.md +++ b/samples/openapi3/client/petstore/java/jersey2-java8/README.md @@ -148,6 +148,7 @@ Class | Method | HTTP request | Description *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | *FakeApi* | [**getArrayOfEnums**](docs/FakeApi.md#getArrayOfEnums) | **GET** /fake/array-of-enums | Array of Enums +*FakeApi* | [**postArrayOfString**](docs/FakeApi.md#postArrayOfString) | **POST** /fake/request-array-string | Array of string *FakeApi* | [**testAdditionalPropertiesReference**](docs/FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties *FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | *FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml index 07f94406542..5ba70986005 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml +++ b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml @@ -1193,6 +1193,25 @@ paths: tags: - fake x-accepts: application/json + /fake/request-array-string: + post: + operationId: postArrayOfString + requestBody: + content: + application/json: + schema: + items: + pattern: "[A-Z0-9]+" + type: string + type: array + responses: + "200": + description: ok + summary: Array of string + tags: + - fake + x-content-type: application/json + x-accepts: application/json components: requestBodies: UserArray: diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md index 567b5637ad2..3816afc1ce7 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md @@ -10,6 +10,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2* | [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | | | [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | | | [**getArrayOfEnums**](FakeApi.md#getArrayOfEnums) | **GET** /fake/array-of-enums | Array of Enums | +| [**postArrayOfString**](FakeApi.md#postArrayOfString) | **POST** /fake/request-array-string | Array of string | | [**testAdditionalPropertiesReference**](FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties | | [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | | | [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | | @@ -404,6 +405,68 @@ No authorization required | **200** | Got named array of enums | - | +## postArrayOfString + +> postArrayOfString(requestBody) + +Array of string + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.model.*; +import org.openapitools.client.api.FakeApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + FakeApi apiInstance = new FakeApi(defaultClient); + List requestBody = Arrays.asList(); // List | + try { + apiInstance.postArrayOfString(requestBody); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#postArrayOfString"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **requestBody** | **List<String>**| | [optional] | + +### Return type + +null (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: application/json +- **Accept**: Not defined + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | ok | - | + + ## testAdditionalPropertiesReference > testAdditionalPropertiesReference(requestBody) diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index 492a14cdbdb..10f9702f0aa 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -268,6 +268,40 @@ public class FakeApi { new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, null, localVarReturnType, false); } + /** + * Array of string + * + * @param requestBody (optional) + * @throws ApiException if fails to make API call + * @http.response.details + + + +
Status Code Description Response Headers
200 ok -
+ */ + public void postArrayOfString(List requestBody) throws ApiException { + postArrayOfStringWithHttpInfo(requestBody); + } + + /** + * Array of string + * + * @param requestBody (optional) + * @return ApiResponse<Void> + * @throws ApiException if fails to make API call + * @http.response.details + + + +
Status Code Description Response Headers
200 ok -
+ */ + public ApiResponse postArrayOfStringWithHttpInfo(List requestBody) throws ApiException { + String localVarAccept = apiClient.selectHeaderAccept(); + String localVarContentType = apiClient.selectHeaderContentType("application/json"); + return apiClient.invokeAPI("FakeApi.postArrayOfString", "/fake/request-array-string", "POST", new ArrayList<>(), requestBody, + new LinkedHashMap<>(), new LinkedHashMap<>(), new LinkedHashMap<>(), localVarAccept, localVarContentType, + null, null, false); + } /** * test referenced additionalProperties *