[Java] Better tests for jakarta option (webclient, resttemplate) (Ope…

…nAPITools#14363)

* test java jakarta in new workflow jdk 17

* update workflow

* skip jakarta test in jdk11

.github/workflows/samples-java-client-jdk17.yaml

@@ -0,0 +1,39 @@
+name: Samples Java Client JDK17
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/java/resttemplate-jakarta/**
+      - samples/client/petstore/java/webclient-jakarta/**
+  pull_request:
+    paths:
+      - samples/client/petstore/java/resttemplate-jakarta/**
+      - samples/client/petstore/java/webclient-jakarta/**
+jobs:
+  build:
+    name: Build Java Client JDK17
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/java/resttemplate-jakarta
+          - samples/client/petstore/java/webclient-jakarta
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Cache maven dependencies
+        uses: actions/cache@v3
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package

bin/configs/java-resttemplate-jakarta.yaml

@@ -1,7 +1,7 @@
 generatorName: java
 outputDir: samples/client/petstore/java/resttemplate-jakarta
 library: resttemplate
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   artifactId: petstore-resttemplate

samples/client/petstore/java/resttemplate-jakarta/.openapi-generator/FILES

@@ -5,60 +5,15 @@ README.md
 api/openapi.yaml
 build.gradle
 build.sbt
-docs/AdditionalPropertiesAnyType.md
-docs/AdditionalPropertiesArray.md
-docs/AdditionalPropertiesBoolean.md
-docs/AdditionalPropertiesClass.md
-docs/AdditionalPropertiesInteger.md
-docs/AdditionalPropertiesNumber.md
-docs/AdditionalPropertiesObject.md
-docs/AdditionalPropertiesString.md
-docs/Animal.md
-docs/AnotherFakeApi.md
-docs/ArrayOfArrayOfNumberOnly.md
-docs/ArrayOfNumberOnly.md
-docs/ArrayTest.md
-docs/BigCat.md
-docs/BigCatAllOf.md
-docs/Capitalization.md
-docs/Cat.md
-docs/CatAllOf.md
 docs/Category.md
-docs/ClassModel.md
-docs/Client.md
-docs/Dog.md
-docs/DogAllOf.md
-docs/EnumArrays.md
-docs/EnumClass.md
-docs/EnumTest.md
-docs/FakeApi.md
-docs/FakeClassnameTags123Api.md
-docs/FileSchemaTestClass.md
-docs/FormatTest.md
-docs/HasOnlyReadOnly.md
-docs/MapTest.md
-docs/MixedPropertiesAndAdditionalPropertiesClass.md
-docs/Model200Response.md
 docs/ModelApiResponse.md
-docs/ModelFile.md
-docs/ModelList.md
-docs/ModelReturn.md
-docs/Name.md
-docs/NumberOnly.md
 docs/Order.md
-docs/OuterComposite.md
-docs/OuterEnum.md
 docs/Pet.md
 docs/PetApi.md
-docs/ReadOnlyFirst.md
-docs/SpecialModelName.md
 docs/StoreApi.md
 docs/Tag.md
-docs/TypeHolderDefault.md
-docs/TypeHolderExample.md
 docs/User.md
 docs/UserApi.md
-docs/XmlItem.md
 git_push.sh
 gradle.properties
 gradle/wrapper/gradle-wrapper.jar
@@ -73,9 +28,6 @@ src/main/java/org/openapitools/client/JavaTimeFormatter.java
 src/main/java/org/openapitools/client/RFC3339DateFormat.java
 src/main/java/org/openapitools/client/ServerConfiguration.java
 src/main/java/org/openapitools/client/ServerVariable.java
-src/main/java/org/openapitools/client/api/AnotherFakeApi.java
-src/main/java/org/openapitools/client/api/FakeApi.java
-src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
 src/main/java/org/openapitools/client/api/PetApi.java
 src/main/java/org/openapitools/client/api/StoreApi.java
 src/main/java/org/openapitools/client/api/UserApi.java
@@ -85,51 +37,9 @@ src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
 src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
 src/main/java/org/openapitools/client/auth/OAuth.java
 src/main/java/org/openapitools/client/auth/OAuthFlow.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
-src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
-src/main/java/org/openapitools/client/model/Animal.java
-src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
-src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
-src/main/java/org/openapitools/client/model/ArrayTest.java
-src/main/java/org/openapitools/client/model/BigCat.java
-src/main/java/org/openapitools/client/model/BigCatAllOf.java
-src/main/java/org/openapitools/client/model/Capitalization.java
-src/main/java/org/openapitools/client/model/Cat.java
-src/main/java/org/openapitools/client/model/CatAllOf.java
 src/main/java/org/openapitools/client/model/Category.java
-src/main/java/org/openapitools/client/model/ClassModel.java
-src/main/java/org/openapitools/client/model/Client.java
-src/main/java/org/openapitools/client/model/Dog.java
-src/main/java/org/openapitools/client/model/DogAllOf.java
-src/main/java/org/openapitools/client/model/EnumArrays.java
-src/main/java/org/openapitools/client/model/EnumClass.java
-src/main/java/org/openapitools/client/model/EnumTest.java
-src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
-src/main/java/org/openapitools/client/model/FormatTest.java
-src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
-src/main/java/org/openapitools/client/model/MapTest.java
-src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
-src/main/java/org/openapitools/client/model/Model200Response.java
 src/main/java/org/openapitools/client/model/ModelApiResponse.java
-src/main/java/org/openapitools/client/model/ModelFile.java
-src/main/java/org/openapitools/client/model/ModelList.java
-src/main/java/org/openapitools/client/model/ModelReturn.java
-src/main/java/org/openapitools/client/model/Name.java
-src/main/java/org/openapitools/client/model/NumberOnly.java
 src/main/java/org/openapitools/client/model/Order.java
-src/main/java/org/openapitools/client/model/OuterComposite.java
-src/main/java/org/openapitools/client/model/OuterEnum.java
 src/main/java/org/openapitools/client/model/Pet.java
-src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
-src/main/java/org/openapitools/client/model/SpecialModelName.java
 src/main/java/org/openapitools/client/model/Tag.java
-src/main/java/org/openapitools/client/model/TypeHolderDefault.java
-src/main/java/org/openapitools/client/model/TypeHolderExample.java
 src/main/java/org/openapitools/client/model/User.java
-src/main/java/org/openapitools/client/model/XmlItem.java

samples/client/petstore/java/resttemplate-jakarta/README.md

@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 - API version: 1.0.0
 
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 
 
 *Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
@@ -82,21 +82,25 @@ Please follow the [installation](#installation) instruction and execute the foll
 import org.openapitools.client.*;
 import org.openapitools.client.auth.*;
 import org.openapitools.client.model.*;
-import org.openapitools.client.api.AnotherFakeApi;
+import org.openapitools.client.api.PetApi;
 
-public class AnotherFakeApiExample {
+public class PetApiExample {
 
     public static void main(String[] args) {
         ApiClient defaultClient = Configuration.getDefaultApiClient();
-        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        defaultClient.setBasePath("http://petstore.swagger.io/v2");
 
-        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client body = new Client(); // Client | client model
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store
         try {
-            Client result = apiInstance.call123testSpecialTags(body);
+            Pet result = apiInstance.addPet(pet);
             System.out.println(result);
         } catch (ApiException e) {
-            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Exception when calling PetApi#addPet");
             System.err.println("Status code: " + e.getCode());
             System.err.println("Reason: " + e.getResponseBody());
             System.err.println("Response headers: " + e.getResponseHeaders());
@@ -109,26 +113,10 @@ public class AnotherFakeApiExample {
 
 ## Documentation for API Endpoints
 
-All URIs are relative to *http://petstore.swagger.io:80/v2*
+All URIs are relative to *http://petstore.swagger.io/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
-*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
-*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
-*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
-*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
-*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
-*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
-*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
-*FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
-*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
-*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
-*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
-*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
-*FakeApi* | [**testQueryParameterCollectionFormat**](docs/FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-parameters | 
-*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
 *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
 *PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
@@ -137,10 +125,9 @@ Class | Method | HTTP request | Description
 *PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
 *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
 *PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
-*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
-*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
 *StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
-*StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
 *StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
 *UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
 *UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
@@ -154,54 +141,12 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
- - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
- - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
- - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
- - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
- - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
- - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
- - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
- - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
- - [Animal](docs/Animal.md)
- - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
- - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
- - [ArrayTest](docs/ArrayTest.md)
- - [BigCat](docs/BigCat.md)
- - [BigCatAllOf](docs/BigCatAllOf.md)
- - [Capitalization](docs/Capitalization.md)
- - [Cat](docs/Cat.md)
- - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
- - [ClassModel](docs/ClassModel.md)
- - [Client](docs/Client.md)
- - [Dog](docs/Dog.md)
- - [DogAllOf](docs/DogAllOf.md)
- - [EnumArrays](docs/EnumArrays.md)
- - [EnumClass](docs/EnumClass.md)
- - [EnumTest](docs/EnumTest.md)
- - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
- - [FormatTest](docs/FormatTest.md)
- - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
- - [MapTest](docs/MapTest.md)
- - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
- - [Model200Response](docs/Model200Response.md)
  - [ModelApiResponse](docs/ModelApiResponse.md)
- - [ModelFile](docs/ModelFile.md)
- - [ModelList](docs/ModelList.md)
- - [ModelReturn](docs/ModelReturn.md)
- - [Name](docs/Name.md)
- - [NumberOnly](docs/NumberOnly.md)
  - [Order](docs/Order.md)
- - [OuterComposite](docs/OuterComposite.md)
- - [OuterEnum](docs/OuterEnum.md)
  - [Pet](docs/Pet.md)
- - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
- - [SpecialModelName](docs/SpecialModelName.md)
  - [Tag](docs/Tag.md)
- - [TypeHolderDefault](docs/TypeHolderDefault.md)
- - [TypeHolderExample](docs/TypeHolderExample.md)
  - [User](docs/User.md)
- - [XmlItem](docs/XmlItem.md)
 
 
 ## Documentation for Authorization
@@ -214,18 +159,6 @@ Authentication schemes defined for the API:
 - **API key parameter name**: api_key
 - **Location**: HTTP header
 
-### api_key_query
-
-
-- **Type**: API key
-- **API key parameter name**: api_key_query
-- **Location**: URL query string
-
-### http_basic_test
-
-
-- **Type**: HTTP basic authentication
-
 ### petstore_auth