From c0a2673b26bd04bf107144b29b9c1540f665c8e1 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Tue, 8 May 2018 17:32:50 +0800
Subject: [PATCH] update eiffel codegen default (#371)

---
 .../languages/AbstractEiffelCodegen.java      |  2 +-
 .../languages/EiffelClientCodegen.java        | 13 +-----
 .../src/main/resources/Eiffel/README.mustache |  2 +-
 samples/client/petstore/eiffel/README.md      |  8 ++--
 samples/client/petstore/eiffel/api_client.ecf |  4 +-
 samples/client/petstore/eiffel/docs/ANIMAL.md |  2 +-
 samples/client/petstore/eiffel/docs/CAT.md    |  2 +-
 samples/client/petstore/eiffel/docs/DOG.md    |  2 +-
 .../client/petstore/eiffel/docs/FAKE_API.md   | 40 +++++++++----------
 samples/client/petstore/eiffel/docs/ORDER.md  |  2 +-
 .../client/petstore/eiffel/docs/PET_API.md    |  8 ++--
 .../eiffel/src/api/another_fake_api.e         |  8 ++--
 .../client/petstore/eiffel/src/api/fake_api.e | 36 ++++++++---------
 .../src/api/fake_classname_tags123_api.e      |  8 ++--
 .../client/petstore/eiffel/src/api/pet_api.e  | 16 ++++----
 .../petstore/eiffel/src/api/store_api.e       |  8 ++--
 .../client/petstore/eiffel/src/api/user_api.e |  8 ++--
 .../client/petstore/eiffel/src/api_client.e   | 10 ++---
 .../src/domain/additional_properties_class.e  |  8 ++--
 .../petstore/eiffel/src/domain/animal.e       |  8 ++--
 .../petstore/eiffel/src/domain/animal_farm.e  |  8 ++--
 .../petstore/eiffel/src/domain/api_response.e |  8 ++--
 .../domain/array_of_array_of_number_only.e    |  8 ++--
 .../eiffel/src/domain/array_of_number_only.e  |  8 ++--
 .../petstore/eiffel/src/domain/array_test.e   |  8 ++--
 .../eiffel/src/domain/capitalization.e        |  8 ++--
 .../client/petstore/eiffel/src/domain/cat.e   |  8 ++--
 .../petstore/eiffel/src/domain/category.e     |  8 ++--
 .../petstore/eiffel/src/domain/class_model.e  |  8 ++--
 .../petstore/eiffel/src/domain/client.e       |  8 ++--
 .../client/petstore/eiffel/src/domain/dog.e   |  8 ++--
 .../petstore/eiffel/src/domain/enum_arrays.e  |  8 ++--
 .../petstore/eiffel/src/domain/enum_class.e   |  8 ++--
 .../petstore/eiffel/src/domain/enum_test.e    |  8 ++--
 .../petstore/eiffel/src/domain/format_test.e  |  8 ++--
 .../eiffel/src/domain/has_only_read_only.e    |  8 ++--
 .../petstore/eiffel/src/domain/map_test.e     |  8 ++--
 ...operties_and_additional_properties_class.e |  8 ++--
 .../eiffel/src/domain/model_200_response.e    |  8 ++--
 .../client/petstore/eiffel/src/domain/name.e  |  8 ++--
 .../petstore/eiffel/src/domain/number_only.e  |  8 ++--
 .../client/petstore/eiffel/src/domain/order.e |  8 ++--
 .../eiffel/src/domain/outer_composite.e       |  8 ++--
 .../petstore/eiffel/src/domain/outer_enum.e   |  8 ++--
 .../client/petstore/eiffel/src/domain/pet.e   |  8 ++--
 .../eiffel/src/domain/read_only_first.e       |  8 ++--
 .../petstore/eiffel/src/domain/return.e       |  8 ++--
 .../eiffel/src/domain/special_model_name.e    |  8 ++--
 .../client/petstore/eiffel/src/domain/tag.e   |  8 ++--
 .../client/petstore/eiffel/src/domain/user.e  |  8 ++--
 .../eiffel/src/framework/api_client_request.e |  8 ++--
 .../src/framework/api_client_response.e       |  8 ++--
 .../petstore/eiffel/src/framework/api_error.e |  8 ++--
 .../petstore/eiffel/src/framework/api_i.e     |  8 ++--
 .../eiffel/src/framework/auth/api_key_auth.e  |  8 ++--
 .../src/framework/auth/authentication.e       |  8 ++--
 .../src/framework/auth/http_basic_auth.e      |  8 ++--
 .../eiffel/src/framework/auth/oauth.e         |  8 ++--
 .../eiffel/src/framework/configuration.e      |  8 ++--
 .../serialization/api_deserializer.e          |  8 ++--
 .../serialization/api_json_deserializer.e     |  8 ++--
 .../serialization/api_json_serializer.e       |  8 ++--
 .../framework/serialization/api_serializer.e  |  8 ++--
 .../client/petstore/eiffel/test/api_test.ecf  |  2 +-
 64 files changed, 266 insertions(+), 275 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
index e2b8db525f3..d701e35308f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
@@ -103,7 +103,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
 
         cliOptions.clear();
         cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Eiffel Cluster name (convention: lowercase).")
-                .defaultValue("swagger"));
+                .defaultValue("openapi"));
         cliOptions
                 .add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Eiffel package version.").defaultValue("1.0.0"));
         cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP,
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java
index 4d8fb8b2dae..0d2d1f1a85e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/EiffelClientCodegen.java
@@ -18,26 +18,17 @@
 package org.openapitools.codegen.languages;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.*;
-import org.openapitools.codegen.mustache.*;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.*;
-import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.parameters.*;
 
 public class EiffelClientCodegen extends AbstractEiffelCodegen {
     static Logger LOGGER = LoggerFactory.getLogger(EiffelClientCodegen.class);
 
-    protected String libraryTarget = "swagger_eiffel_client";
+    protected String libraryTarget = "openapi_eiffel_client";
     protected String packageName = "Eiffel";
     protected String packageVersion = "1.0.0";
     protected String apiDocPath = "docs";
@@ -85,7 +76,7 @@ public class EiffelClientCodegen extends AbstractEiffelCodegen {
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
             setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
         } else {
-            setPackageName("swagger");
+            setPackageName("openapi");
         }
 
         if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
diff --git a/modules/openapi-generator/src/main/resources/Eiffel/README.mustache b/modules/openapi-generator/src/main/resources/Eiffel/README.mustache
index 3ed363b621a..f8ba1b5e2eb 100644
--- a/modules/openapi-generator/src/main/resources/Eiffel/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/README.mustache
@@ -20,7 +20,7 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 ## Installation
 Add the library into your Eiffel configuration file.
 ```
-    "<library name="api_client" location="%PATH_TO_EIFFEL_SWAGGER_CLIENT%\api_client.ecf"/>"
+    "<library name="api_client" location="%PATH_TO_EIFFEL_OPENAPI_CLIENT%\api_client.ecf"/>"
 ```
 
 ## Documentation for API Endpoints
diff --git a/samples/client/petstore/eiffel/README.md b/samples/client/petstore/eiffel/README.md
index 09eb8d2ed84..bb363368532 100644
--- a/samples/client/petstore/eiffel/README.md
+++ b/samples/client/petstore/eiffel/README.md
@@ -1,9 +1,9 @@
-# Eiffel API client for swagger
+# Eiffel API client for openapi
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
 ## Overview
-This API client was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-spec) from a remote server, you can easily generate an API client.
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
 
 - API version: 1.0.0
 - Package version: 1.0.0
@@ -12,7 +12,7 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge
 ## Installation
 Add the library into your Eiffel configuration file.
 ```
-    "<library name="api_client" location="%PATH_TO_EIFFEL_SWAGGER_CLIENT%\api_client.ecf"/>"
+    "<library name="api_client" location="%PATH_TO_EIFFEL_OPENAPI_CLIENT%\api_client.ecf"/>"
 ```
 
 ## Documentation for API Endpoints
@@ -122,5 +122,5 @@ Class | Method | HTTP request | Description
 
 ## Author
 
-apiteam@swagger.io
+
 
diff --git a/samples/client/petstore/eiffel/api_client.ecf b/samples/client/petstore/eiffel/api_client.ecf
index 25170a5e91b..6f0ef48e482 100644
--- a/samples/client/petstore/eiffel/api_client.ecf
+++ b/samples/client/petstore/eiffel/api_client.ecf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="swagger_eiffel_client" uuid="7c410689-cf67-4f0e-b19d-52edf62edf61" library_target="swagger_eiffel_client">	
-	<target name="swagger_eiffel_client">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="openapi_eiffel_client" uuid="6bc0532f-414f-4f9d-887e-8e3280e5fc98" library_target="openapi_eiffel_client">	
+	<target name="openapi_eiffel_client">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/\.git$</exclude>
diff --git a/samples/client/petstore/eiffel/docs/ANIMAL.md b/samples/client/petstore/eiffel/docs/ANIMAL.md
index 8781202d46d..7b9373a9b07 100644
--- a/samples/client/petstore/eiffel/docs/ANIMAL.md
+++ b/samples/client/petstore/eiffel/docs/ANIMAL.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **class_name** | [**STRING_32**](STRING_32.md) |  | [default to null]
-**color** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**color** | [**STRING_32**](STRING_32.md) |  | [optional] [default to red]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/eiffel/docs/CAT.md b/samples/client/petstore/eiffel/docs/CAT.md
index ae5be9725cd..f56e0187e4d 100644
--- a/samples/client/petstore/eiffel/docs/CAT.md
+++ b/samples/client/petstore/eiffel/docs/CAT.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **class_name** | [**STRING_32**](STRING_32.md) |  | [default to null]
-**color** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**color** | [**STRING_32**](STRING_32.md) |  | [optional] [default to red]
 **declawed** | **BOOLEAN** |  | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/eiffel/docs/DOG.md b/samples/client/petstore/eiffel/docs/DOG.md
index 6916b39be9a..059dc2a5f58 100644
--- a/samples/client/petstore/eiffel/docs/DOG.md
+++ b/samples/client/petstore/eiffel/docs/DOG.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **class_name** | [**STRING_32**](STRING_32.md) |  | [default to null]
-**color** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**color** | [**STRING_32**](STRING_32.md) |  | [optional] [default to red]
 **breed** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/eiffel/docs/FAKE_API.md b/samples/client/petstore/eiffel/docs/FAKE_API.md
index ce773e8647c..94888d07772 100644
--- a/samples/client/petstore/eiffel/docs/FAKE_API.md
+++ b/samples/client/petstore/eiffel/docs/FAKE_API.md
@@ -208,20 +208,20 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **number** | **REAL_32**| None | 
- **double** | **REAL_64**| None | 
- **pattern_without_delimiter** | **STRING_32**| None | 
- **byte** | **ARRAY [NATURAL_8]**| None | 
- **integer** | **INTEGER_32**| None | [optional] 
- **int32** | **INTEGER_32**| None | [optional] 
- **int64** | **INTEGER_64**| None | [optional] 
- **float** | **REAL_32**| None | [optional] 
- **string** | **STRING_32**| None | [optional] 
- **binary** | **FILE**| None | [optional] 
- **date** | **DATE**| None | [optional] 
- **date_time** | **DATE_TIME**| None | [optional] 
- **password** | **STRING_32**| None | [optional] 
- **callback** | **STRING_32**| None | [optional] 
+ **number** | **REAL_32**| None | [default to null]
+ **double** | **REAL_64**| None | [default to null]
+ **pattern_without_delimiter** | **STRING_32**| None | [default to null]
+ **byte** | **ARRAY [NATURAL_8]**| None | [default to null]
+ **integer** | **INTEGER_32**| None | [optional] [default to null]
+ **int32** | **INTEGER_32**| None | [optional] [default to null]
+ **int64** | **INTEGER_64**| None | [optional] [default to null]
+ **float** | **REAL_32**| None | [optional] [default to null]
+ **string** | **STRING_32**| None | [optional] [default to null]
+ **binary** | **FILE**| None | [optional] [default to null]
+ **date** | **DATE**| None | [optional] [default to null]
+ **date_time** | **DATE_TIME**| None | [optional] [default to null]
+ **password** | **STRING_32**| None | [optional] [default to null]
+ **callback** | **STRING_32**| None | [optional] [default to null]
 
 ### Return type
 
@@ -257,8 +257,8 @@ Name | Type | Description  | Notes
  **enum_query_string** | **STRING_32**| Query parameter enum test (string) | [optional] [default to -efg]
  **enum_query_integer** | **INTEGER_32**| Query parameter enum test (double) | [optional] 
  **enum_query_double** | **REAL_64**| Query parameter enum test (double) | [optional] 
- **enum_form_string_array** | [**LIST [STRING_32]**](LIST.md)| Form parameter enum test (string array) | [optional] 
- **enum_form_string** | **STRING_32**| Form parameter enum test (string) | [optional] 
+ **enum_form_string_array** | **LIST [STRING_32]**| Form parameter enum test (string array) | [optional] [default to $]
+ **enum_form_string** | **STRING_32**| Form parameter enum test (string) | [optional] [default to -efg]
 
 ### Return type
 
@@ -276,7 +276,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **test_inline_additional_properties**
-> test_inline_additional_properties (request_body: STRING_32 )
+> test_inline_additional_properties (request_body: STRING_TABLE[STRING_32] )
 	
 
 test inline additionalProperties
@@ -286,7 +286,7 @@ test inline additionalProperties
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **request_body** | [**STRING_32**](STRING_32.md)| request body | 
+ **request_body** | [**STRING_TABLE[STRING_32]**](STRING_32.md)| request body | 
 
 ### Return type
 
@@ -314,8 +314,8 @@ test json serialization of form data
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **param** | **STRING_32**| field1 | 
- **param2** | **STRING_32**| field2 | 
+ **param** | **STRING_32**| field1 | [default to null]
+ **param2** | **STRING_32**| field2 | [default to null]
 
 ### Return type
 
diff --git a/samples/client/petstore/eiffel/docs/ORDER.md b/samples/client/petstore/eiffel/docs/ORDER.md
index 627e6ef8536..a6c58151324 100644
--- a/samples/client/petstore/eiffel/docs/ORDER.md
+++ b/samples/client/petstore/eiffel/docs/ORDER.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **quantity** | **INTEGER_32** |  | [optional] [default to null]
 **ship_date** | [**DATE_TIME**](DATE_TIME.md) |  | [optional] [default to null]
 **status** | [**STRING_32**](STRING_32.md) | Order Status | [optional] [default to null]
-**complete** | **BOOLEAN** |  | [optional] [default to null]
+**complete** | **BOOLEAN** |  | [optional] [default to false]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/eiffel/docs/PET_API.md b/samples/client/petstore/eiffel/docs/PET_API.md
index 8de596b59b8..2bd3122ea68 100644
--- a/samples/client/petstore/eiffel/docs/PET_API.md
+++ b/samples/client/petstore/eiffel/docs/PET_API.md
@@ -201,8 +201,8 @@ Updates a pet in the store with form data
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **pet_id** | **INTEGER_64**| ID of pet that needs to be updated | 
- **name** | **STRING_32**| Updated name of the pet | [optional] 
- **status** | **STRING_32**| Updated status of the pet | [optional] 
+ **name** | **STRING_32**| Updated name of the pet | [optional] [default to null]
+ **status** | **STRING_32**| Updated status of the pet | [optional] [default to null]
 
 ### Return type
 
@@ -231,8 +231,8 @@ uploads an image
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **pet_id** | **INTEGER_64**| ID of pet to update | 
- **additional_metadata** | **STRING_32**| Additional data to pass to server | [optional] 
- **file** | **FILE**| file to upload | [optional] 
+ **additional_metadata** | **STRING_32**| Additional data to pass to server | [optional] [default to null]
+ **file** | **FILE**| file to upload | [optional] [default to null]
 
 ### Return type
 
diff --git a/samples/client/petstore/eiffel/src/api/another_fake_api.e b/samples/client/petstore/eiffel/src/api/another_fake_api.e
index 0db5b6bc7b2..0a912d7f819 100644
--- a/samples/client/petstore/eiffel/src/api/another_fake_api.e
+++ b/samples/client/petstore/eiffel/src/api/another_fake_api.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	ANOTHERFAKE_API
diff --git a/samples/client/petstore/eiffel/src/api/fake_api.e b/samples/client/petstore/eiffel/src/api/fake_api.e
index 04434aa8e5e..6e7a054c2bd 100644
--- a/samples/client/petstore/eiffel/src/api/fake_api.e
+++ b/samples/client/petstore/eiffel/src/api/fake_api.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	FAKE_API
@@ -244,25 +244,25 @@ feature -- API Access
 			-- 
 			-- argument: byte None (required)
 			-- 
-			-- argument: integer None (optional)
+			-- argument: integer None (optional, default to null)
 			-- 
-			-- argument: int32 None (optional)
+			-- argument: int32 None (optional, default to null)
 			-- 
-			-- argument: int64 None (optional)
+			-- argument: int64 None (optional, default to null)
 			-- 
-			-- argument: float None (optional)
+			-- argument: float None (optional, default to null)
 			-- 
-			-- argument: string None (optional)
+			-- argument: string None (optional, default to null)
 			-- 
-			-- argument: binary None (optional)
+			-- argument: binary None (optional, default to null)
 			-- 
-			-- argument: date None (optional)
+			-- argument: date None (optional, default to null)
 			-- 
-			-- argument: date_time None (optional)
+			-- argument: date_time None (optional, default to null)
 			-- 
-			-- argument: password None (optional)
+			-- argument: password None (optional, default to null)
 			-- 
-			-- argument: callback None (optional)
+			-- argument: callback None (optional, default to null)
 			-- 
 			-- 
 		require
@@ -339,7 +339,7 @@ feature -- API Access
 			end
 		end	
 
-	test_enum_parameters (enum_header_string_array: detachable LIST [STRING_32]; enum_header_string: STRING_32; enum_query_string_array: detachable LIST [STRING_32]; enum_query_string: STRING_32; enum_query_integer: INTEGER_32; enum_query_double: REAL_64; enum_form_string_array: detachable LIST [STRING_32]; enum_form_string: STRING_32)
+	test_enum_parameters (enum_header_string_array: detachable LIST [STRING_32]; enum_header_string: STRING_32; enum_query_string_array: detachable LIST [STRING_32]; enum_query_string: STRING_32; enum_query_integer: INTEGER_32; enum_query_double: REAL_64; enum_form_string_array: LIST [STRING_32]; enum_form_string: STRING_32)
 			-- To test enum parameters
 			-- To test enum parameters
 			-- 
@@ -355,9 +355,9 @@ feature -- API Access
 			-- 
 			-- argument: enum_query_double Query parameter enum test (double) (optional)
 			-- 
-			-- argument: enum_form_string_array Form parameter enum test (string array) (optional)
+			-- argument: enum_form_string_array Form parameter enum test (string array) (optional, default to $)
 			-- 
-			-- argument: enum_form_string Form parameter enum test (string) (optional)
+			-- argument: enum_form_string Form parameter enum test (string) (optional, default to -efg)
 			-- 
 			-- 
 		require
@@ -399,7 +399,7 @@ feature -- API Access
 			end
 		end	
 
-	test_inline_additional_properties (request_body: STRING_32)
+	test_inline_additional_properties (request_body: STRING_TABLE[STRING_32])
 			-- test inline additionalProperties
 			-- 
 			-- 
diff --git a/samples/client/petstore/eiffel/src/api/fake_classname_tags123_api.e b/samples/client/petstore/eiffel/src/api/fake_classname_tags123_api.e
index a59ab041964..de7f29df8af 100644
--- a/samples/client/petstore/eiffel/src/api/fake_classname_tags123_api.e
+++ b/samples/client/petstore/eiffel/src/api/fake_classname_tags123_api.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	FAKECLASSNAMETAGS123_API
diff --git a/samples/client/petstore/eiffel/src/api/pet_api.e b/samples/client/petstore/eiffel/src/api/pet_api.e
index c79b5dcc9bc..17a482737ed 100644
--- a/samples/client/petstore/eiffel/src/api/pet_api.e
+++ b/samples/client/petstore/eiffel/src/api/pet_api.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	PET_API
@@ -234,9 +234,9 @@ feature -- API Access
 			-- 
 			-- argument: pet_id ID of pet that needs to be updated (required)
 			-- 
-			-- argument: name Updated name of the pet (optional)
+			-- argument: name Updated name of the pet (optional, default to null)
 			-- 
-			-- argument: status Updated status of the pet (optional)
+			-- argument: status Updated status of the pet (optional, default to null)
 			-- 
 			-- 
 		require
@@ -275,9 +275,9 @@ feature -- API Access
 			-- 
 			-- argument: pet_id ID of pet to update (required)
 			-- 
-			-- argument: additional_metadata Additional data to pass to server (optional)
+			-- argument: additional_metadata Additional data to pass to server (optional, default to null)
 			-- 
-			-- argument: file file to upload (optional)
+			-- argument: file file to upload (optional, default to null)
 			-- 
 			-- 
 			-- Result API_RESPONSE
diff --git a/samples/client/petstore/eiffel/src/api/store_api.e b/samples/client/petstore/eiffel/src/api/store_api.e
index bf139f070e8..2f0854b3b39 100644
--- a/samples/client/petstore/eiffel/src/api/store_api.e
+++ b/samples/client/petstore/eiffel/src/api/store_api.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	STORE_API
diff --git a/samples/client/petstore/eiffel/src/api/user_api.e b/samples/client/petstore/eiffel/src/api/user_api.e
index 7a06043bef0..3b5703b40cf 100644
--- a/samples/client/petstore/eiffel/src/api/user_api.e
+++ b/samples/client/petstore/eiffel/src/api/user_api.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	USER_API
diff --git a/samples/client/petstore/eiffel/src/api_client.e b/samples/client/petstore/eiffel/src/api_client.e
index 7f2268c9115..6397c4293d6 100644
--- a/samples/client/petstore/eiffel/src/api_client.e
+++ b/samples/client/petstore/eiffel/src/api_client.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"  
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"  
 
 class
 	API_CLIENT
@@ -27,7 +27,7 @@ feature {NONE} -- Initialization
 			set_base_path (default_base_path)
 
 				--set default user_agent
-			set_user_agent("Swagger-Codegen//Eiffel");	
+			set_user_agent("OpenAPI-Generator//Eiffel");
 
 			create authentications.make (3) 
 			authentications.force (create {API_KEY_AUTH}.make ("header", "api_key"), "api_key") 
diff --git a/samples/client/petstore/eiffel/src/domain/additional_properties_class.e b/samples/client/petstore/eiffel/src/domain/additional_properties_class.e
index b9ab7816b88..f11b85fd007 100644
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_class.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_class.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ADDITIONAL_PROPERTIES_CLASS 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/animal.e b/samples/client/petstore/eiffel/src/domain/animal.e
index 76cb16be570..72fa473c5a0 100644
--- a/samples/client/petstore/eiffel/src/domain/animal.e
+++ b/samples/client/petstore/eiffel/src/domain/animal.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ANIMAL 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/animal_farm.e b/samples/client/petstore/eiffel/src/domain/animal_farm.e
index b5b678a9306..47f42895406 100644
--- a/samples/client/petstore/eiffel/src/domain/animal_farm.e
+++ b/samples/client/petstore/eiffel/src/domain/animal_farm.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ANIMAL_FARM 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/api_response.e b/samples/client/petstore/eiffel/src/domain/api_response.e
index 56bfb4c42af..8b3e64ff046 100644
--- a/samples/client/petstore/eiffel/src/domain/api_response.e
+++ b/samples/client/petstore/eiffel/src/domain/api_response.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class API_RESPONSE 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/array_of_array_of_number_only.e b/samples/client/petstore/eiffel/src/domain/array_of_array_of_number_only.e
index 6aff5202438..b261e583d68 100644
--- a/samples/client/petstore/eiffel/src/domain/array_of_array_of_number_only.e
+++ b/samples/client/petstore/eiffel/src/domain/array_of_array_of_number_only.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ARRAY_OF_ARRAY_OF_NUMBER_ONLY 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/array_of_number_only.e b/samples/client/petstore/eiffel/src/domain/array_of_number_only.e
index 96af38a7d48..5a37891c500 100644
--- a/samples/client/petstore/eiffel/src/domain/array_of_number_only.e
+++ b/samples/client/petstore/eiffel/src/domain/array_of_number_only.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ARRAY_OF_NUMBER_ONLY 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/array_test.e b/samples/client/petstore/eiffel/src/domain/array_test.e
index 9715c2ee31f..a0c54fcf6fe 100644
--- a/samples/client/petstore/eiffel/src/domain/array_test.e
+++ b/samples/client/petstore/eiffel/src/domain/array_test.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ARRAY_TEST 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/capitalization.e b/samples/client/petstore/eiffel/src/domain/capitalization.e
index c404d519779..b5b4c5b238a 100644
--- a/samples/client/petstore/eiffel/src/domain/capitalization.e
+++ b/samples/client/petstore/eiffel/src/domain/capitalization.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CAPITALIZATION 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/cat.e b/samples/client/petstore/eiffel/src/domain/cat.e
index 92306569700..c041e4d8db5 100644
--- a/samples/client/petstore/eiffel/src/domain/cat.e
+++ b/samples/client/petstore/eiffel/src/domain/cat.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CAT 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/category.e b/samples/client/petstore/eiffel/src/domain/category.e
index a8af6ef3bda..8bd714c7261 100644
--- a/samples/client/petstore/eiffel/src/domain/category.e
+++ b/samples/client/petstore/eiffel/src/domain/category.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CATEGORY 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/class_model.e b/samples/client/petstore/eiffel/src/domain/class_model.e
index bd5467a2004..711a9a56844 100644
--- a/samples/client/petstore/eiffel/src/domain/class_model.e
+++ b/samples/client/petstore/eiffel/src/domain/class_model.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CLASS_MODEL 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/client.e b/samples/client/petstore/eiffel/src/domain/client.e
index 09a0ca0f244..666e391e516 100644
--- a/samples/client/petstore/eiffel/src/domain/client.e
+++ b/samples/client/petstore/eiffel/src/domain/client.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CLIENT 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/dog.e b/samples/client/petstore/eiffel/src/domain/dog.e
index e8882e5673c..120d8b86f9c 100644
--- a/samples/client/petstore/eiffel/src/domain/dog.e
+++ b/samples/client/petstore/eiffel/src/domain/dog.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class DOG 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/enum_arrays.e b/samples/client/petstore/eiffel/src/domain/enum_arrays.e
index 6e4556c0a27..ddb0fd5594b 100644
--- a/samples/client/petstore/eiffel/src/domain/enum_arrays.e
+++ b/samples/client/petstore/eiffel/src/domain/enum_arrays.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ENUM_ARRAYS 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/enum_class.e b/samples/client/petstore/eiffel/src/domain/enum_class.e
index 72d3af1c509..79a0e952b2f 100644
--- a/samples/client/petstore/eiffel/src/domain/enum_class.e
+++ b/samples/client/petstore/eiffel/src/domain/enum_class.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ENUM_CLASS
 
 feature -- Access
diff --git a/samples/client/petstore/eiffel/src/domain/enum_test.e b/samples/client/petstore/eiffel/src/domain/enum_test.e
index 62ed6a94a60..87cf363f701 100644
--- a/samples/client/petstore/eiffel/src/domain/enum_test.e
+++ b/samples/client/petstore/eiffel/src/domain/enum_test.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ENUM_TEST 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/format_test.e b/samples/client/petstore/eiffel/src/domain/format_test.e
index 1cfc14dd511..52d9167188f 100644
--- a/samples/client/petstore/eiffel/src/domain/format_test.e
+++ b/samples/client/petstore/eiffel/src/domain/format_test.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class FORMAT_TEST 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/has_only_read_only.e b/samples/client/petstore/eiffel/src/domain/has_only_read_only.e
index 3f4b4c2c48f..27cf1ba49d0 100644
--- a/samples/client/petstore/eiffel/src/domain/has_only_read_only.e
+++ b/samples/client/petstore/eiffel/src/domain/has_only_read_only.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class HAS_ONLY_READ_ONLY 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/map_test.e b/samples/client/petstore/eiffel/src/domain/map_test.e
index 9239d728035..0e7cf934f01 100644
--- a/samples/client/petstore/eiffel/src/domain/map_test.e
+++ b/samples/client/petstore/eiffel/src/domain/map_test.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class MAP_TEST 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/mixed_properties_and_additional_properties_class.e b/samples/client/petstore/eiffel/src/domain/mixed_properties_and_additional_properties_class.e
index 2c58ad38df8..2bb76decc07 100644
--- a/samples/client/petstore/eiffel/src/domain/mixed_properties_and_additional_properties_class.e
+++ b/samples/client/petstore/eiffel/src/domain/mixed_properties_and_additional_properties_class.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class MIXED_PROPERTIES_AND_ADDITIONAL_PROPERTIES_CLASS 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/model_200_response.e b/samples/client/petstore/eiffel/src/domain/model_200_response.e
index 1f68322fdcc..a365d406b58 100644
--- a/samples/client/petstore/eiffel/src/domain/model_200_response.e
+++ b/samples/client/petstore/eiffel/src/domain/model_200_response.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class MODEL_200_RESPONSE 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/name.e b/samples/client/petstore/eiffel/src/domain/name.e
index 2a4d5a1b04e..2d1c49cc063 100644
--- a/samples/client/petstore/eiffel/src/domain/name.e
+++ b/samples/client/petstore/eiffel/src/domain/name.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class NAME 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/number_only.e b/samples/client/petstore/eiffel/src/domain/number_only.e
index fed93149c70..270cbcbea3c 100644
--- a/samples/client/petstore/eiffel/src/domain/number_only.e
+++ b/samples/client/petstore/eiffel/src/domain/number_only.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class NUMBER_ONLY 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/order.e b/samples/client/petstore/eiffel/src/domain/order.e
index 0a43788a36b..0da3b9349f9 100644
--- a/samples/client/petstore/eiffel/src/domain/order.e
+++ b/samples/client/petstore/eiffel/src/domain/order.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ORDER 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/outer_composite.e b/samples/client/petstore/eiffel/src/domain/outer_composite.e
index 11a4bcdc432..845476ed151 100644
--- a/samples/client/petstore/eiffel/src/domain/outer_composite.e
+++ b/samples/client/petstore/eiffel/src/domain/outer_composite.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class OUTER_COMPOSITE 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/outer_enum.e b/samples/client/petstore/eiffel/src/domain/outer_enum.e
index a607b4cc55a..c88e2c561a0 100644
--- a/samples/client/petstore/eiffel/src/domain/outer_enum.e
+++ b/samples/client/petstore/eiffel/src/domain/outer_enum.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class OUTER_ENUM
 
 feature -- Access
diff --git a/samples/client/petstore/eiffel/src/domain/pet.e b/samples/client/petstore/eiffel/src/domain/pet.e
index 34654eff7ed..86d845c22e8 100644
--- a/samples/client/petstore/eiffel/src/domain/pet.e
+++ b/samples/client/petstore/eiffel/src/domain/pet.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class PET 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/read_only_first.e b/samples/client/petstore/eiffel/src/domain/read_only_first.e
index f743f5e32d8..65d41d07fac 100644
--- a/samples/client/petstore/eiffel/src/domain/read_only_first.e
+++ b/samples/client/petstore/eiffel/src/domain/read_only_first.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class READ_ONLY_FIRST 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/return.e b/samples/client/petstore/eiffel/src/domain/return.e
index d0dce4c43d5..2e08c0f53d9 100644
--- a/samples/client/petstore/eiffel/src/domain/return.e
+++ b/samples/client/petstore/eiffel/src/domain/return.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class RETURN 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/special_model_name.e b/samples/client/petstore/eiffel/src/domain/special_model_name.e
index 8a233120f73..90e30e783f2 100644
--- a/samples/client/petstore/eiffel/src/domain/special_model_name.e
+++ b/samples/client/petstore/eiffel/src/domain/special_model_name.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class SPECIAL_MODEL_NAME 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/tag.e b/samples/client/petstore/eiffel/src/domain/tag.e
index 46ef4326709..f62729bed5d 100644
--- a/samples/client/petstore/eiffel/src/domain/tag.e
+++ b/samples/client/petstore/eiffel/src/domain/tag.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class TAG 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/domain/user.e b/samples/client/petstore/eiffel/src/domain/user.e
index 729e7c0c65e..07586c1b55d 100644
--- a/samples/client/petstore/eiffel/src/domain/user.e
+++ b/samples/client/petstore/eiffel/src/domain/user.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class USER 
 
 inherit
diff --git a/samples/client/petstore/eiffel/src/framework/api_client_request.e b/samples/client/petstore/eiffel/src/framework/api_client_request.e
index 62a882ea13a..fcd2a09d141 100644
--- a/samples/client/petstore/eiffel/src/framework/api_client_request.e
+++ b/samples/client/petstore/eiffel/src/framework/api_client_request.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	API_CLIENT_REQUEST
diff --git a/samples/client/petstore/eiffel/src/framework/api_client_response.e b/samples/client/petstore/eiffel/src/framework/api_client_response.e
index 1d5c0230f4b..cf0978b2579 100644
--- a/samples/client/petstore/eiffel/src/framework/api_client_response.e
+++ b/samples/client/petstore/eiffel/src/framework/api_client_response.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class
 	API_CLIENT_RESPONSE
 
diff --git a/samples/client/petstore/eiffel/src/framework/api_error.e b/samples/client/petstore/eiffel/src/framework/api_error.e
index 28ad33fa77d..ca89aae7f7a 100644
--- a/samples/client/petstore/eiffel/src/framework/api_error.e
+++ b/samples/client/petstore/eiffel/src/framework/api_error.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	API_ERROR
diff --git a/samples/client/petstore/eiffel/src/framework/api_i.e b/samples/client/petstore/eiffel/src/framework/api_i.e
index da1688fcc16..ca0a45cd41c 100644
--- a/samples/client/petstore/eiffel/src/framework/api_i.e
+++ b/samples/client/petstore/eiffel/src/framework/api_i.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class API_I
 
diff --git a/samples/client/petstore/eiffel/src/framework/auth/api_key_auth.e b/samples/client/petstore/eiffel/src/framework/auth/api_key_auth.e
index 9cd03d4208b..4087386d601 100644
--- a/samples/client/petstore/eiffel/src/framework/auth/api_key_auth.e
+++ b/samples/client/petstore/eiffel/src/framework/auth/api_key_auth.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class
 	API_KEY_AUTH
 
diff --git a/samples/client/petstore/eiffel/src/framework/auth/authentication.e b/samples/client/petstore/eiffel/src/framework/auth/authentication.e
index d4f70460eb6..b53248ae6e3 100644
--- a/samples/client/petstore/eiffel/src/framework/auth/authentication.e
+++ b/samples/client/petstore/eiffel/src/framework/auth/authentication.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"  
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"  
 
 deferred class
 	AUTHENTICATION
diff --git a/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e b/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e
index 24aa58826ff..3fd7664bcec 100644
--- a/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e
+++ b/samples/client/petstore/eiffel/src/framework/auth/http_basic_auth.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	HTTP_BASIC_AUTH
diff --git a/samples/client/petstore/eiffel/src/framework/auth/oauth.e b/samples/client/petstore/eiffel/src/framework/auth/oauth.e
index bdcad7515c4..66b4ba5c3c5 100644
--- a/samples/client/petstore/eiffel/src/framework/auth/oauth.e
+++ b/samples/client/petstore/eiffel/src/framework/auth/oauth.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class
 	OAUTH
 
diff --git a/samples/client/petstore/eiffel/src/framework/configuration.e b/samples/client/petstore/eiffel/src/framework/configuration.e
index 806373bda4f..3b9fe5e834e 100644
--- a/samples/client/petstore/eiffel/src/framework/configuration.e
+++ b/samples/client/petstore/eiffel/src/framework/configuration.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	CONFIGURATION
diff --git a/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e b/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e
index 8484d1ac6f6..22f065ace99 100644
--- a/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e
+++ b/samples/client/petstore/eiffel/src/framework/serialization/api_deserializer.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	API_DESERIALIZER
diff --git a/samples/client/petstore/eiffel/src/framework/serialization/api_json_deserializer.e b/samples/client/petstore/eiffel/src/framework/serialization/api_json_deserializer.e
index 060324421fc..993decf6a2c 100644
--- a/samples/client/petstore/eiffel/src/framework/serialization/api_json_deserializer.e
+++ b/samples/client/petstore/eiffel/src/framework/serialization/api_json_deserializer.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 expanded class
 	API_JSON_DESERIALIZER
diff --git a/samples/client/petstore/eiffel/src/framework/serialization/api_json_serializer.e b/samples/client/petstore/eiffel/src/framework/serialization/api_json_serializer.e
index bc124a8d79f..b7a144f7018 100644
--- a/samples/client/petstore/eiffel/src/framework/serialization/api_json_serializer.e
+++ b/samples/client/petstore/eiffel/src/framework/serialization/api_json_serializer.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 expanded class
 	API_JSON_SERIALIZER
diff --git a/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e b/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e
index 35a4b32321f..db5d96af069 100644
--- a/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e
+++ b/samples/client/petstore/eiffel/src/framework/serialization/api_serializer.e
@@ -1,17 +1,17 @@
 note
  description:"[
-		Swagger Petstore
+		OpenAPI Petstore
  		This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
   		OpenAPI spec version: 1.0.0
- 	    Contact: apiteam@swagger.io
+ 	    
 
-  	NOTE: This class is auto generated by the swagger code generator program.
+  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
  		 Do not edit the class manually.
  	]"
 	date: "$Date$"
 	revision: "$Revision$"
-	EIS:"Eiffel swagger codegen", "src=https://github.com/swagger-api/swagger-codegen.git", "protocol=uri"
+	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 
 class
 	API_SERIALIZER
diff --git a/samples/client/petstore/eiffel/test/api_test.ecf b/samples/client/petstore/eiffel/test/api_test.ecf
index b5113d45d13..ddb5082cabe 100644
--- a/samples/client/petstore/eiffel/test/api_test.ecf
+++ b/samples/client/petstore/eiffel/test/api_test.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="test" 	uuid="3cf2b389-59f2-44e3-ac08-8e56b2d443a0">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="test" 	uuid="b9f84148-1d42-4fe8-a34e-33444db7d206">
 	<target name="test">
 		<root feature="make" class="APPLICATION"/>
 		<file_rule>