[Eiffel] various enhancements (#8076)

* Updated Eiffel code generator. Added missing language reserved words. Updated mustache templates to use the latest Eiffel rules to avoid obsolte feature calls and Cat-Calls. Updated Eiffel configuration files (ecf's) Updated comments styles. Updated Travis CI file to use the latest Eiffel compiler. Updated EIffel sample to use https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml * Added missing mapping decimal to REAL_64 Added Eiffel Kernel classes to importMapping to avoid generate models for them. Fixed issue with Eiffel feature name generation, updated toOperationId(String) method. Simplified toInstantiationType method implementaetion. Improved model.mustache to generate Eiffel models. * Updated Eiffel sample. * Removed unneeded tabs. * Added AnyType mapping to ANY Removed unneeded tab Updated model name, remane models that starts with _. * update doc Co-authored-by: William Cheng <wing328hk@gmail.com>
2020-12-06 23:07:03 -03:00 · 2020-12-06 23:07:03 -03:00 · c0c2f2b804
commit c0c2f2b804
parent 3195338c47
135 changed files with 3201 additions and 974 deletions
--- a/docs/generators/eiffel.md
+++ b/docs/generators/eiffel.md
@ -15,6 +15,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl

 | Type/Alias | Imports |
 | ---------- | ------- |
+|File|FILE|
+|List|LIST|
+|Map|STRING_TABLE|
+|Set|SET|
+|file|FILE|


 ## INSTANTIATION TYPES
@ -52,6 +57,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>and</li>
 <li>as</li>
 <li>assign</li>
+<li>attached</li>
 <li>attribute</li>
 <li>check</li>
 <li>class</li>
@ -60,6 +66,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>current</li>
 <li>debug</li>
 <li>deferred</li>
+<li>detachable</li>
 <li>do</li>
 <li>else</li>
 <li>elseif</li>
--- 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
@ -48,8 +48,8 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co

        setReservedWordsLowerCase(Arrays.asList(
                // language reserved words
-                "across", "agent", "alias", "all", "and", "as", "assign", "attribute", "check", "class", "convert",
-                "create", "Current", "debug", "deferred", "do", "else", "elseif", "end", "ensure", "expanded", "export",
+                "across", "agent", "alias", "all", "and", "as", "assign", "attached", "attribute", "check", "class", "convert",
+                "create", "Current", "debug", "deferred", "detachable", "do", "else", "elseif", "end", "ensure", "expanded", "export",
                "external", "False", "feature", "from", "frozen", "if", "implies", "inherit", "inspect", "invariant",
                "like", "local", "loop", "not", "note", "obsolete", "old", "once", "only", "or", "Precursor",
                "redefine", "rename", "require", "rescue", "Result", "retry", "select", "separate", "then", "True",
@ -68,6 +68,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
        typeMapping.put("long", "INTEGER_64");
        typeMapping.put("number", "REAL_32");
        typeMapping.put("float", "REAL_32");
+        typeMapping.put("decimal", "REAL_64");
        typeMapping.put("double", "REAL_64");
        typeMapping.put("boolean", "BOOLEAN");
        typeMapping.put("string", "STRING_32");
@ -85,10 +86,17 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
        typeMapping.put("map", "STRING_TABLE");
        typeMapping.put("array", "LIST");
        typeMapping.put("list", "LIST");
+        typeMapping.put("AnyType", "ANY");

        instantiationTypes.put("array", "ARRAYED_LIST");
        instantiationTypes.put("list", "ARRAYED_LIST");
        instantiationTypes.put("map", "STRING_TABLE");
+        
+        importMapping.put("List", "LIST");
+        importMapping.put("Set", "SET");
+        importMapping.put("file", "FILE");
+        importMapping.put("File", "FILE");
+        importMapping.put("Map", "STRING_TABLE");


        cliOptions.clear();
@ -167,6 +175,12 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co

    @Override
    public String toModelFilename(String name) {
+        // We need to check if import-mapping has a different model for this class, so we use it
+        // instead of the auto-generated one.
+        if (importMapping.containsKey(name)) {
+            return importMapping.get(name);
+        }
+
        if (!StringUtils.isEmpty(modelNamePrefix)) {
            name = modelNamePrefix + "_" + name;
        }
@ -191,6 +205,13 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
            name = "model_" + name; // e.g. 200Response => Model200Response
            // (after camelize)
        }
+        // model name starts with _
+        if (name.startsWith("_")) {
+            LOGGER.warn(name + " (model name starts with _) cannot be used as model name. Renamed to "
+                    + ("model" + name));
+            name = "model" + name; // e.g. 200Response => Model200Response
+            // (after camelize)
+        }

        return underscore(name);
    }
@ -278,7 +299,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = getAdditionalProperties(p);

-            return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
+            return getSchemaType(p) + " [" + getTypeDeclaration(inner) + "]";
        }
        // return super.getTypeDeclaration(p);

@ -315,7 +336,12 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co

    @Override
    public String toOperationId(String operationId) {
-        String sanitizedOperationId = sanitizeName(operationId);
+        // throw exception if method name is empty
+        if (StringUtils.isEmpty(operationId)) {
+            throw new RuntimeException("Empty method/operation name (operationId) not allowed");
+        }
+
+        String sanitizedOperationId = camelize(sanitizeName(operationId), true);

        // method name cannot use reserved keyword, e.g. return
        if (isReservedWord(sanitizedOperationId)) {
@ -323,6 +349,13 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
                    + camelize("call_" + operationId));
            sanitizedOperationId = "call_" + sanitizedOperationId;
        }
+        
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
+            sanitizedOperationId = camelize("call_" + sanitizedOperationId, true);
+        }
+
        // method name from updateSomething to update_Something.
        sanitizedOperationId = unCamelize(sanitizedOperationId);

@ -537,22 +570,23 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co

    @Override
    public String toInstantiationType(Schema p) {
-        if (ModelUtils.isMapSchema(p)) {
-            Schema additionalProperties2 = getAdditionalProperties(p);
-            String type = additionalProperties2.getType();
-            if (null == type) {
-                LOGGER.error("No Type defined for Additional Schema " + additionalProperties2 + "\n" //
-                        + "\tIn Schema: " + p);
-            }
-            String inner = toModelName(getSchemaType(additionalProperties2));
-            return instantiationTypes.get("map") + " [" + inner + "]";
-        } else if (ModelUtils.isArraySchema(p)) {
-            ArraySchema ap = (ArraySchema) p;
-            String inner = toModelName(getSchemaType(ap.getItems()));
-            return instantiationTypes.get("array") + " [" + inner + "]";
-        } else {
-            return null;
-        }
+        return getTypeDeclaration(p);
+//        if (ModelUtils.isMapSchema(p)) {
+//            Schema additionalProperties2 = getAdditionalProperties(p);
+//            String type = additionalProperties2.getType();
+//            if (null == type) {
+//                LOGGER.error("No Type defined for Additional Schema " + additionalProperties2 + "\n" //
+//                        + "\tIn Schema: " + p);
+//            }
+//            String inner = toModelName(getSchemaType(additionalProperties2));
+//            return instantiationTypes.get("map") + " [" + inner + "]";
+//        } else if (ModelUtils.isArraySchema(p)) {
+//            ArraySchema ap = (ArraySchema) p;
+//            String inner = toModelName(getSchemaType(ap.getItems()));
+//            return instantiationTypes.get("array") + " [" + inner + "]";
+//        } else {
+//            return null;
+//        }
    }

    public String unCamelize(String name) {
--- a/modules/openapi-generator/src/main/resources/Eiffel/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/api.mustache
@ -59,11 +59,11 @@ feature -- API Access
 			end
 			{{/formParams}}

-			if attached {STRING} api_client.select_header_accept (<<{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}>>),"Content-Type")
-			l_request.set_auth_names (<<{{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}}>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<{{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}}>>)
 			l_response := api_client.call_api (l_path, "{{httpMethod}}", l_request, {{#returnType}}Void{{/returnType}}{{^returnType}}agent serializer{{/returnType}}, {{#returnType}}agent deserializer{{/returnType}}{{^returnType}}Void{{/returnType}})
 			{{#returnType}}	
 			if l_response.has_error then
--- a/modules/openapi-generator/src/main/resources/Eiffel/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/api_client.mustache
@ -233,7 +233,8 @@ feature -- Query Parameter Helpers
 						-- dateTime	string	date-time	As defined by date-time - RFC3339
 					Result := date_time.date.debug_output
 				elseif attached {STRING_32} a_param as str_32 then
-					Result := str_32
+						-- TODO check if this is a good convertion.
+					Result := str_32.to_string_8
 				elseif attached {STRING_8} a_param as str_8 then
 					Result := str_8
 				else
@ -420,18 +421,18 @@ feature -- HTTP client: call api
 			end
 		end

-	add_header_params (a_content_executor:HTTP_CLIENT_REQUEST_CONTEXT; a_header_params: STRING_TABLE [STRING])
+	add_header_params (a_content_executor:HTTP_CLIENT_REQUEST_CONTEXT; a_header_params: STRING_TABLE [READABLE_STRING_8])
 			-- Set header parameters `a_header_params' to the request context executor `a_content_executor', including default headers.
 		do
 				-- headers
 			across a_header_params as ic  loop
-				a_content_executor.add_header (ic.key.as_string_8, ic.item)
+				a_content_executor.add_header (ic.key.to_string_8, ic.item)
 			end

 				-- default headers
 			across default_header_map as ic  loop
 				if not a_header_params.has (ic.key) then
-					a_content_executor.add_header (ic.key.as_string_8, ic.item)
+					a_content_executor.add_header (ic.key.to_string_8, ic.item)
 				end
 			end
 		end
@ -484,7 +485,7 @@ feature -- HTTP client: Change Element

 feature {NONE} -- Implementation

-	default_header_map: STRING_TABLE [STRING]
+	default_header_map: STRING_TABLE [READABLE_STRING_8]
 			-- default header map.

 	http_session: detachable HTTP_CLIENT_SESSION
--- a/modules/openapi-generator/src/main/resources/Eiffel/ecf.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/ecf.mustache
@ -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="{{libraryTarget}}" uuid="{{uuid}}" library_target="{{libraryTarget}}">	
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-21-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-21-0 http://www.eiffel.com/developers/xml/configuration-1-21-0.xsd" name="{{libraryTarget}}" uuid="{{uuid}}" library_target="{{libraryTarget}}">	
 	<target name="{{libraryTarget}}">
 		<root all_classes="true"/>
 		<file_rule>
@ -8,17 +8,17 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
+		<option warning="warning" manifest_array_type="mismatch_warning">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
+		</option>		
 		<setting name="console_application" value="true"/>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
-		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri-safe.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
+		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
 		<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid.ecf"/>
 		<cluster name="client" location=".\src" recursive="true"/>
 	</target>
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/api_client_response.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/api_client_response.mustache
@ -7,7 +7,7 @@ create

 feature {NONE} -- Initialization

-	make (a_response: detachable HTTP_CLIENT_RESPONSE; a_error: detachable API_ERROR; a_custom_deserializer: detachable FUNCTION [TUPLE [STRING, STRING, TYPE [detachable ANY]], detachable ANY])
+	make (a_response: detachable HTTP_CLIENT_RESPONSE; a_error: detachable API_ERROR; a_custom_deserializer: detachable FUNCTION [TUPLE [READABLE_STRING_8, READABLE_STRING_8, TYPE [detachable ANY]], detachable ANY])
 		do
 			response := a_response
 			error := a_error
@ -23,6 +23,7 @@ feature -- Access
 		end

 	status: INTEGER
+			-- Status code of the response.
 		do
 			if attached response as l_response then
 				Result := l_response.status
@ -32,7 +33,7 @@ feature -- Access
 feature -- Data

 	data (a_type: TYPE [detachable ANY]): detachable ANY
-			-- Data representation of the HTTP Response
+			-- Data representation of the HTTP Response.
 		do
 			if
 				attached response as l_response  and then
@ -54,8 +55,7 @@ feature {NONE} -- Implementation
 	response: detachable HTTP_CLIENT_RESPONSE
 			-- Low level response returned by the API call.

-	deserializer: detachable FUNCTION [TUPLE [STRING, STRING, TYPE [detachable ANY]], detachable ANY]
-			-- function to map a response body with a given content type to the target
-			-- in the domain model.
+	deserializer: detachable FUNCTION [TUPLE [READABLE_STRING_8, READABLE_STRING_8, TYPE [detachable ANY]], detachable ANY]
+			-- Function to map a response body with a given content type to the target in the domain model.

 end
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/api_i.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/api_i.mustache
@ -24,12 +24,12 @@ feature {NONE} -- Initialization
 feature -- Status Report

    last_error: detachable API_ERROR
-            -- last error if any from the API call.
+            -- Last error if any from the API call.

 feature -- Error

 	reset_error
-			-- reset `last_error' to void.
+			-- Reset `last_error' to void.
 		do
 			last_error := Void
 		end
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/api_key_auth.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/api_key_auth.mustache
@ -45,7 +45,7 @@ feature -- Change Element

 feature -- Access

-   apply_to_params(a_query_params: LIST [TUPLE [name:STRING; value:STRING]]; a_header_params: STRING_TABLE [STRING])
+   apply_to_params(a_query_params: LIST [TUPLE [name:READABLE_STRING_8; value:READABLE_STRING_8]]; a_header_params: STRING_TABLE [READABLE_STRING_8])
   			-- <Precursor>.
   		local
   			l_value: STRING_32
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/authentication.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/authentication.mustache
@ -5,7 +5,7 @@ deferred class

 feature -- Access

-   apply_to_params(a_query_params: LIST [TUPLE [name:STRING; value:STRING]]; a_header_params: STRING_TABLE [STRING])
+   apply_to_params(a_query_params: LIST [TUPLE [name:READABLE_STRING_8; value:READABLE_STRING_8]]; a_header_params: STRING_TABLE [READABLE_STRING_8])
   			-- Apply authentication settings to header and query params.
   			-- `a_query_params' List of query parameters.
   			-- `a_header_params' Map of header parameters.
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/http_basic_auth.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/http_basic_auth.mustache
@ -10,10 +10,10 @@ inherit
 feature -- Access

 	user_name: detachable STRING_32
-			-- user name.
+			-- User name.

 	password: detachable STRING_32
-			-- password.
+			-- Password.

 feature -- Element Change	

@ -35,14 +35,15 @@ feature -- Element Change

 feature -- Access

-	apply_to_params(a_query_params: LIST [TUPLE [name:STRING; value:STRING]]; a_header_params: STRING_TABLE [STRING])
+	apply_to_params(a_query_params: LIST [TUPLE [name:READABLE_STRING_8; value:READABLE_STRING_8]]; a_header_params: STRING_TABLE [READABLE_STRING_8])
   			-- <Precursor>.
 		do
 			if
 				attached user_name as l_username and then
 				attached password as l_password
 			then
-				a_header_params.force ("Basic " + (create {BASE64}).encoded_string (l_username + ":" + l_password) , "Authorization")
+					-- TODO check if this convertion it's ok.
+				a_header_params.force ("Basic " + (create {BASE64}).encoded_string (l_username.to_string_8 + ":" + l_password.to_string_8) , "Authorization")
 			end
   		end

--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/oauth.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/auth/oauth.mustache
@ -20,11 +20,12 @@ feature -- Change Element
 			access_token_set: access_token = a_token
 		end

-	apply_to_params(a_query_params: LIST [TUPLE [name:STRING; value:STRING]]; a_header_params: STRING_TABLE [STRING])
+	apply_to_params (a_query_params: LIST [TUPLE [name:READABLE_STRING_8; value:READABLE_STRING_8]]; a_header_params: STRING_TABLE [READABLE_STRING_8])
   			-- <Precursor>.
 		do
 			if attached access_token as l_access_token then
-				a_header_params.force ("Bearer " + l_access_token,"Authorization" )
+					-- TODO check if this convertion is ok.
+				a_header_params.force ("Bearer " + l_access_token.to_string_8,"Authorization" )
 			end
 		end
 end
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_deserializer.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_deserializer.mustache
@ -5,8 +5,8 @@ class

 feature -- Access

-	deserializer (f: FUNCTION [TUPLE [content_type:STRING; body:STRING; type:TYPE [detachable ANY]], detachable ANY]; a_content_type: STRING; a_body: STRING; a_type:TYPE [detachable ANY]): detachable ANY
-			-- -- From a given response deserialize body `a_body' with conent_type `a_content_type' to a target object of type `a_type'.
+	deserializer (f: FUNCTION [TUPLE [content_type:READABLE_STRING_8; body:READABLE_STRING_8; type:TYPE [detachable ANY]], detachable ANY]; a_content_type: READABLE_STRING_8; a_body: READABLE_STRING_8; a_type:TYPE [detachable ANY]): detachable ANY
+			-- From a given response deserialize body `a_body' with conent_type `a_content_type' to a target object of type `a_type'.
 		do
 			Result := f.item ([a_content_type, a_body, a_type])
 		end
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_serializer.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/api_serializer.mustache
@ -6,9 +6,10 @@ class

 feature -- Access

-	serializer (f: FUNCTION [TUPLE [content_type:STRING; type:ANY],STRING]; a_content_type: STRING; a_type: ANY): STRING
+	serializer (f: FUNCTION [TUPLE [content_type:READABLE_STRING_8; type:ANY],READABLE_STRING_8]; a_content_type: READABLE_STRING_8; a_type: ANY): STRING_8
 			-- Serialize an object of type `a_type' using the content type `a_content_type'.
 		do
-			Result := f.item ([a_content_type, a_type])
+				-- TODO check if this convertion it's ok.
+			Result := f.item ([a_content_type, a_type]).to_string_8
 		end
 end
--- a/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/json_basic_reflector_deserializer.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/framework/serialization/json_basic_reflector_deserializer.mustache
@ -274,7 +274,7 @@ feature {NONE} -- Helpers: Object

 	reference_from_json_object (a_json_object: JSON_OBJECT; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable ANY
 		local
-			l_type_name: detachable READABLE_STRING_32
+			l_type_name: detachable READABLE_STRING_8
 			ref: REFLECTED_REFERENCE_OBJECT
 			i: INTEGER
 			fn: READABLE_STRING_GENERAL
@ -285,7 +285,7 @@ feature {NONE} -- Helpers: Object
 					-- Updated to use the Type info insted of the type_field in JSON.
 					--  fn.same_string ({JSON_REFLECTOR_SERIALIZER}.type_field_name
 				if attached a_type then
-					l_type_name := a_type.name.as_string_32
+					l_type_name := a_type.name.to_string_8
 				end
 				Result := new_instance_of (l_type_name, a_type)
 				if Result = Void then
--- a/modules/openapi-generator/src/main/resources/Eiffel/model.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/model.mustache
@ -1,26 +1,21 @@
 class {{classname}} 

+{{#parent}}
 inherit
+{{/parent}}

-  ANY
-      redefine
-          out 
-      {{#parent}}    
-      select
-          out  
-      {{/parent}}      
-      end

 {{#parent}}
-  {{{parent}}} 
+  {{{parent}}}
+     {{^isPrimitiveType}} 
+      {{^isMap}}
+      {{^isArray}}
      rename
-          out as out_{{{parentSchema}}},
-          is_equal as is_equal_{{{parentSchema}}},
-          copy as copy_{{{parentSchema}}}
-      select
-          is_equal_{{{parentSchema}}},
-          copy_{{{parentSchema}}}     
-      end   
+          output as out_{{{parentSchema}}}     
+      end
+     {{/isArray}}
+     {{/isMap}}
+     {{/isPrimitiveType}}    
 {{/parent}}

 feature --Access
@ -28,8 +23,16 @@ feature --Access
 {{#vars}}
    {{^isInherited}}
    {{#isPrimitiveType}}
-    {{name}}: {{{dataType}}} 
-      {{#description}}-- {{{description}}}{{/description}}
+    {{^isContainer}}
+ 	{{name}}: {{{dataType}}} 
+    	 {{#description}}-- {{{description}}}{{/description}}
+     {{/isContainer}}  
+    {{/isPrimitiveType}}
+    {{#isPrimitiveType}}
+    {{#isContainer}}
+ 	{{name}}: detachable {{{datatypeWithEnum}}} 
+    	 {{#description}}-- {{{description}}}{{/description}}
+    {{/isContainer}}  
    {{/isPrimitiveType}}
    {{^isPrimitiveType}}
    {{#isContainer}}
@ -61,7 +64,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/modules/openapi-generator/src/main/resources/Eiffel/test/ecf_test.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/test/ecf_test.mustache
@ -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="{{uuidTest}}">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-21-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-21-0 http://www.eiffel.com/developers/xml/configuration-1-21-0.xsd" name="test" uuid="{{uuidTest}}">
 	<target name="test">
 		<root feature="make" class="APPLICATION"/>
 		<file_rule>
@ -8,15 +8,15 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
+		<option warning="warning" manifest_array_type="mismatch_warning">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
+		</option>		
 		<setting name="console_application" value="true"/>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
 		<library name="api_client" location="..\api_client.ecf" readonly="false"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid.ecf"/>
 		<cluster name="test" location=".\" recursive="true"/>
 	</target>
--- a/modules/openapi-generator/src/main/resources/Eiffel/travis.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/travis.mustache
@ -1,16 +1,12 @@
 language: eiffel
 before_script:
-  - export current_dir=$(pwd)
-  - echo current_dir
-  - cd ..
-  - wget https://ftp.eiffel.com/pub/beta/nightly/Eiffel_17.11_gpl_100608-linux-x86-64.tar.bz2  
-  - tar -xvf Eiffel_17.11_gpl_100608-linux-x86-64.tar.bz2
-  - export ISE_EIFFEL=$PWD/Eiffel_17.11
+  - export current_dir=$PWD ; echo current_dir=$current_dir ; cd ..
  - export ISE_PLATFORM=linux-x86-64
-  - export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin
-  - export PATH=$PATH:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin
+  - curl -sSL https://www.eiffel.org/setup/install.sh | bash -s -- --channel latest  > eiffel.rc
+  - source ./eiffel.rc
+  - echo `ec -version`
  - cd $current_dir
-
+  
 # safelist
 branches:
  only:
--- a/samples/client/petstore/eiffel/.openapi-generator-ignore
+++ b/samples/client/petstore/eiffel/.openapi-generator-ignore
@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
--- a/samples/client/petstore/eiffel/.openapi-generator/FILES
+++ b/samples/client/petstore/eiffel/.openapi-generator/FILES
@ -0,0 +1,129 @@
+.openapi-generator-ignore
+.travis.yml
+README.md
+api_client.ecf
+docs/ADDITIONAL_PROPERTIES_ANY_TYPE.md
+docs/ADDITIONAL_PROPERTIES_ARRAY.md
+docs/ADDITIONAL_PROPERTIES_BOOLEAN.md
+docs/ADDITIONAL_PROPERTIES_CLASS.md
+docs/ADDITIONAL_PROPERTIES_INTEGER.md
+docs/ADDITIONAL_PROPERTIES_NUMBER.md
+docs/ADDITIONAL_PROPERTIES_OBJECT.md
+docs/ADDITIONAL_PROPERTIES_STRING.md
+docs/ANIMAL.md
+docs/ANOTHERFAKE_API.md
+docs/API_RESPONSE.md
+docs/ARRAY_OF_ARRAY_OF_NUMBER_ONLY.md
+docs/ARRAY_OF_NUMBER_ONLY.md
+docs/ARRAY_TEST.md
+docs/BIG_CAT.md
+docs/BIG_CAT_ALL_OF.md
+docs/CAPITALIZATION.md
+docs/CAT.md
+docs/CATEGORY.md
+docs/CAT_ALL_OF.md
+docs/CLASS_MODEL.md
+docs/CLIENT.md
+docs/DOG.md
+docs/DOG_ALL_OF.md
+docs/ENUM_ARRAYS.md
+docs/ENUM_CLASS.md
+docs/ENUM_TEST.md
+docs/FAKECLASSNAMETAGS123_API.md
+docs/FAKE_API.md
+docs/FILE_SCHEMA_TEST_CLASS.md
+docs/FORMAT_TEST.md
+docs/HAS_ONLY_READ_ONLY.md
+docs/MAP_TEST.md
+docs/MIXED_PROPERTIES_AND_ADDITIONAL_PROPERTIES_CLASS.md
+docs/MODEL_200_RESPONSE.md
+docs/NAME.md
+docs/NUMBER_ONLY.md
+docs/ORDER.md
+docs/OUTER_COMPOSITE.md
+docs/OUTER_ENUM.md
+docs/PET.md
+docs/PET_API.md
+docs/READ_ONLY_FIRST.md
+docs/RETURN.md
+docs/SPECIAL_MODEL_NAME.md
+docs/STORE_API.md
+docs/TAG.md
+docs/TYPE_HOLDER_DEFAULT.md
+docs/TYPE_HOLDER_EXAMPLE.md
+docs/USER.md
+docs/USER_API.md
+docs/XML_ITEM.md
+src/api/another_fake_api.e
+src/api/fake_api.e
+src/api/fake_classname_tags123_api.e
+src/api/pet_api.e
+src/api/store_api.e
+src/api/user_api.e
+src/api_client.e
+src/domain/additional_properties_any_type.e
+src/domain/additional_properties_array.e
+src/domain/additional_properties_boolean.e
+src/domain/additional_properties_class.e
+src/domain/additional_properties_integer.e
+src/domain/additional_properties_number.e
+src/domain/additional_properties_object.e
+src/domain/additional_properties_string.e
+src/domain/animal.e
+src/domain/api_response.e
+src/domain/array_of_array_of_number_only.e
+src/domain/array_of_number_only.e
+src/domain/array_test.e
+src/domain/big_cat.e
+src/domain/big_cat_all_of.e
+src/domain/capitalization.e
+src/domain/cat.e
+src/domain/cat_all_of.e
+src/domain/category.e
+src/domain/class_model.e
+src/domain/client.e
+src/domain/dog.e
+src/domain/dog_all_of.e
+src/domain/enum_arrays.e
+src/domain/enum_class.e
+src/domain/enum_test.e
+src/domain/file_schema_test_class.e
+src/domain/format_test.e
+src/domain/has_only_read_only.e
+src/domain/map_test.e
+src/domain/mixed_properties_and_additional_properties_class.e
+src/domain/model_200_response.e
+src/domain/name.e
+src/domain/number_only.e
+src/domain/order.e
+src/domain/outer_composite.e
+src/domain/outer_enum.e
+src/domain/pet.e
+src/domain/read_only_first.e
+src/domain/return.e
+src/domain/special_model_name.e
+src/domain/tag.e
+src/domain/type_holder_default.e
+src/domain/type_holder_example.e
+src/domain/user.e
+src/domain/xml_item.e
+src/framework/api_client_request.e
+src/framework/api_client_response.e
+src/framework/api_error.e
+src/framework/api_i.e
+src/framework/auth/api_key_auth.e
+src/framework/auth/authentication.e
+src/framework/auth/http_basic_auth.e
+src/framework/auth/oauth.e
+src/framework/configuration.e
+src/framework/serialization/api_deserializer.e
+src/framework/serialization/api_json_deserializer.e
+src/framework/serialization/api_json_serializer.e
+src/framework/serialization/api_serializer.e
+src/framework/serialization/json_basic_reflector_deserializer.e
+src/framework/serialization/json_type_utilities_ext.e
+test/api_test.ecf
+test/apis/anotherfake_api_test.e
+test/apis/fake_api_test.e
+test/apis/fakeclassnametags123_api_test.e
+test/application.e
--- a/samples/client/petstore/eiffel/.openapi-generator/VERSION
+++ b/samples/client/petstore/eiffel/.openapi-generator/VERSION
@ -1 +1 @@
-3.0.0-SNAPSHOT
+5.0.0-SNAPSHOT
--- a/samples/client/petstore/eiffel/.travis.yml
+++ b/samples/client/petstore/eiffel/.travis.yml
@ -1,16 +1,12 @@
 language: eiffel
 before_script:
-  - export current_dir=$(pwd)
-  - echo current_dir
-  - cd ..
-  - wget https://ftp.eiffel.com/pub/beta/nightly/Eiffel_17.11_gpl_100608-linux-x86-64.tar.bz2  
-  - tar -xvf Eiffel_17.11_gpl_100608-linux-x86-64.tar.bz2
-  - export ISE_EIFFEL=$PWD/Eiffel_17.11
+  - export current_dir=$PWD ; echo current_dir=$current_dir ; cd ..
  - export ISE_PLATFORM=linux-x86-64
-  - export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin
-  - export PATH=$PATH:$ISE_EIFFEL/tools/spec/$ISE_PLATFORM/bin
+  - curl -sSL https://www.eiffel.org/setup/install.sh | bash -s -- --channel latest  > eiffel.rc
+  - source ./eiffel.rc
+  - echo `ec -version`
  - cd $current_dir
-
+  
 # safelist
 branches:
  only:
--- a/samples/client/petstore/eiffel/README.md
+++ b/samples/client/petstore/eiffel/README.md
@ -21,17 +21,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*

 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*ANOTHERFAKE_API* | [**test_special_tags**](docs/ANOTHERFAKE_API.md#test_special_tags) | **Patch** /another-fake/dummy | To test special tags
+*ANOTHERFAKE_API* | [**call123test_special_tags**](docs/ANOTHERFAKE_API.md#call123test_special_tags) | **Patch** /another-fake/dummy | To test special tags
+*FAKE_API* | [**create_xml_item**](docs/FAKE_API.md#create_xml_item) | **Post** /fake/create_xml_item | creates an XmlItem
 *FAKE_API* | [**fake_outer_boolean_serialize**](docs/FAKE_API.md#fake_outer_boolean_serialize) | **Post** /fake/outer/boolean | 
 *FAKE_API* | [**fake_outer_composite_serialize**](docs/FAKE_API.md#fake_outer_composite_serialize) | **Post** /fake/outer/composite | 
 *FAKE_API* | [**fake_outer_number_serialize**](docs/FAKE_API.md#fake_outer_number_serialize) | **Post** /fake/outer/number | 
 *FAKE_API* | [**fake_outer_string_serialize**](docs/FAKE_API.md#fake_outer_string_serialize) | **Post** /fake/outer/string | 
+*FAKE_API* | [**test_body_with_file_schema**](docs/FAKE_API.md#test_body_with_file_schema) | **Put** /fake/body-with-file-schema | 
 *FAKE_API* | [**test_body_with_query_params**](docs/FAKE_API.md#test_body_with_query_params) | **Put** /fake/body-with-query-params | 
 *FAKE_API* | [**test_client_model**](docs/FAKE_API.md#test_client_model) | **Patch** /fake | To test \&quot;client\&quot; model
-*FAKE_API* | [**test_endpoint_parameters**](docs/FAKE_API.md#test_endpoint_parameters) | **Post** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FAKE_API* | [**test_endpoint_parameters**](docs/FAKE_API.md#test_endpoint_parameters) | **Post** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 *FAKE_API* | [**test_enum_parameters**](docs/FAKE_API.md#test_enum_parameters) | **Get** /fake | To test enum parameters
+*FAKE_API* | [**test_group_parameters**](docs/FAKE_API.md#test_group_parameters) | **Delete** /fake | Fake endpoint to test group parameters (optional)
 *FAKE_API* | [**test_inline_additional_properties**](docs/FAKE_API.md#test_inline_additional_properties) | **Post** /fake/inline-additionalProperties | test inline additionalProperties
 *FAKE_API* | [**test_json_form_data**](docs/FAKE_API.md#test_json_form_data) | **Get** /fake/jsonFormData | test json serialization of form data
+*FAKE_API* | [**test_query_parameter_collection_format**](docs/FAKE_API.md#test_query_parameter_collection_format) | **Put** /fake/test-query-paramters | 
 *FAKECLASSNAMETAGS123_API* | [**test_classname**](docs/FAKECLASSNAMETAGS123_API.md#test_classname) | **Patch** /fake_classname_test | To test class name in snake case
 *PET_API* | [**add_pet**](docs/PET_API.md#add_pet) | **Post** /pet | Add a new pet to the store
 *PET_API* | [**delete_pet**](docs/PET_API.md#delete_pet) | **Delete** /pet/{petId} | Deletes a pet
@ -41,6 +45,7 @@ Class | Method | HTTP request | Description
 *PET_API* | [**update_pet**](docs/PET_API.md#update_pet) | **Put** /pet | Update an existing pet
 *PET_API* | [**update_pet_with_form**](docs/PET_API.md#update_pet_with_form) | **Post** /pet/{petId} | Updates a pet in the store with form data
 *PET_API* | [**upload_file**](docs/PET_API.md#upload_file) | **Post** /pet/{petId}/uploadImage | uploads an image
+*PET_API* | [**upload_file_with_required_file**](docs/PET_API.md#upload_file_with_required_file) | **Post** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
 *STORE_API* | [**delete_order**](docs/STORE_API.md#delete_order) | **Delete** /store/order/{order_id} | Delete purchase order by ID
 *STORE_API* | [**inventory**](docs/STORE_API.md#inventory) | **Get** /store/inventory | Returns pet inventories by status
 *STORE_API* | [**order_by_id**](docs/STORE_API.md#order_by_id) | **Get** /store/order/{order_id} | Find purchase order by ID
@ -57,22 +62,33 @@ Class | Method | HTTP request | Description

 ## Documentation For Models

+ - [ADDITIONAL_PROPERTIES_ANY_TYPE](docs/ADDITIONAL_PROPERTIES_ANY_TYPE.md)
+ - [ADDITIONAL_PROPERTIES_ARRAY](docs/ADDITIONAL_PROPERTIES_ARRAY.md)
+ - [ADDITIONAL_PROPERTIES_BOOLEAN](docs/ADDITIONAL_PROPERTIES_BOOLEAN.md)
 - [ADDITIONAL_PROPERTIES_CLASS](docs/ADDITIONAL_PROPERTIES_CLASS.md)
+ - [ADDITIONAL_PROPERTIES_INTEGER](docs/ADDITIONAL_PROPERTIES_INTEGER.md)
+ - [ADDITIONAL_PROPERTIES_NUMBER](docs/ADDITIONAL_PROPERTIES_NUMBER.md)
+ - [ADDITIONAL_PROPERTIES_OBJECT](docs/ADDITIONAL_PROPERTIES_OBJECT.md)
+ - [ADDITIONAL_PROPERTIES_STRING](docs/ADDITIONAL_PROPERTIES_STRING.md)
 - [ANIMAL](docs/ANIMAL.md)
- - [ANIMAL_FARM](docs/ANIMAL_FARM.md)
 - [API_RESPONSE](docs/API_RESPONSE.md)
 - [ARRAY_OF_ARRAY_OF_NUMBER_ONLY](docs/ARRAY_OF_ARRAY_OF_NUMBER_ONLY.md)
 - [ARRAY_OF_NUMBER_ONLY](docs/ARRAY_OF_NUMBER_ONLY.md)
 - [ARRAY_TEST](docs/ARRAY_TEST.md)
+ - [BIG_CAT](docs/BIG_CAT.md)
+ - [BIG_CAT_ALL_OF](docs/BIG_CAT_ALL_OF.md)
 - [CAPITALIZATION](docs/CAPITALIZATION.md)
 - [CAT](docs/CAT.md)
 - [CATEGORY](docs/CATEGORY.md)
+ - [CAT_ALL_OF](docs/CAT_ALL_OF.md)
 - [CLASS_MODEL](docs/CLASS_MODEL.md)
 - [CLIENT](docs/CLIENT.md)
 - [DOG](docs/DOG.md)
+ - [DOG_ALL_OF](docs/DOG_ALL_OF.md)
 - [ENUM_ARRAYS](docs/ENUM_ARRAYS.md)
 - [ENUM_CLASS](docs/ENUM_CLASS.md)
 - [ENUM_TEST](docs/ENUM_TEST.md)
+ - [FILE_SCHEMA_TEST_CLASS](docs/FILE_SCHEMA_TEST_CLASS.md)
 - [FORMAT_TEST](docs/FORMAT_TEST.md)
 - [HAS_ONLY_READ_ONLY](docs/HAS_ONLY_READ_ONLY.md)
 - [MAP_TEST](docs/MAP_TEST.md)
@ -88,7 +104,10 @@ Class | Method | HTTP request | Description
 - [RETURN](docs/RETURN.md)
 - [SPECIAL_MODEL_NAME](docs/SPECIAL_MODEL_NAME.md)
 - [TAG](docs/TAG.md)
+ - [TYPE_HOLDER_DEFAULT](docs/TYPE_HOLDER_DEFAULT.md)
+ - [TYPE_HOLDER_EXAMPLE](docs/TYPE_HOLDER_EXAMPLE.md)
 - [USER](docs/USER.md)
+ - [XML_ITEM](docs/XML_ITEM.md)


 ## Documentation For Authorization
--- a/samples/client/petstore/eiffel/api_client.ecf
+++ b/samples/client/petstore/eiffel/api_client.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="openapi_eiffel_client" uuid="6bc0532f-414f-4f9d-887e-8e3280e5fc98" library_target="openapi_eiffel_client">	
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-21-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-21-0 http://www.eiffel.com/developers/xml/configuration-1-21-0.xsd" name="openapi_eiffel_client" uuid="06b86bd6-8941-44d0-aa6f-2b0958eb8a18" library_target="openapi_eiffel_client">	
 	<target name="openapi_eiffel_client">
 		<root all_classes="true"/>
 		<file_rule>
@ -8,17 +8,17 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
+		<option warning="warning" manifest_array_type="mismatch_warning">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
+		</option>		
 		<setting name="console_application" value="true"/>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
-		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri-safe.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
+		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
 		<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid.ecf"/>
 		<cluster name="client" location=".\src" recursive="true"/>
 	</target>
--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_ANY_TYPE.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_ANY_TYPE.md
@ -0,0 +1,10 @@
+# ADDITIONAL_PROPERTIES_ANY_TYPE
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | [**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)
+
+
--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_ARRAY.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_ARRAY.md
@ -1,8 +1,9 @@
-# OUTER_NUMBER
+# ADDITIONAL_PROPERTIES_ARRAY

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**name** | [**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)

--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_BOOLEAN.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_BOOLEAN.md
@ -0,0 +1,10 @@
+# ADDITIONAL_PROPERTIES_BOOLEAN
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | [**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)
+
+
--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_CLASS.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_CLASS.md
@ -3,8 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**map_property** | [**STRING_TABLE[STRING_32]**](STRING_32.md) |  | [optional] [default to null]
-**map_of_map_property** | [**STRING_TABLE[STRING_TABLE[STRING_32]]**](STRING_TABLE.md) |  | [optional] [default to null]
+**map_string** | [**STRING_TABLE [STRING_32]**](STRING_32.md) |  | [optional] [default to null]
+**map_number** | **STRING_TABLE [REAL_32]** |  | [optional] [default to null]
+**map_integer** | **STRING_TABLE [INTEGER_32]** |  | [optional] [default to null]
+**map_boolean** | **STRING_TABLE [BOOLEAN]** |  | [optional] [default to null]
+**map_array_integer** | [**STRING_TABLE [LIST [INTEGER_32]]**](LIST.md) |  | [optional] [default to null]
+**map_array_anytype** | [**STRING_TABLE [LIST [ANY]]**](LIST.md) |  | [optional] [default to null]
+**map_map_string** | [**STRING_TABLE [STRING_TABLE [STRING_32]]**](STRING_TABLE.md) |  | [optional] [default to null]
+**map_map_anytype** | [**STRING_TABLE [STRING_TABLE [ANY]]**](STRING_TABLE.md) |  | [optional] [default to null]
+**anytype_1** | [**ANY**](.md) |  | [optional] [default to null]
+**anytype_2** | [**ANY**](.md) |  | [optional] [default to null]
+**anytype_3** | [**ANY**](.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)

--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_INTEGER.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_INTEGER.md
@ -0,0 +1,10 @@
+# ADDITIONAL_PROPERTIES_INTEGER
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | [**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)
+
+
--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_NUMBER.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_NUMBER.md
@ -0,0 +1,10 @@
+# ADDITIONAL_PROPERTIES_NUMBER
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | [**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)
+
+
--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_OBJECT.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_OBJECT.md
@ -0,0 +1,10 @@
+# ADDITIONAL_PROPERTIES_OBJECT
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | [**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)
+
+
--- a/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_STRING.md
+++ b/samples/client/petstore/eiffel/docs/ADDITIONAL_PROPERTIES_STRING.md
@ -0,0 +1,10 @@
+# ADDITIONAL_PROPERTIES_STRING
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | [**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)
+
+
--- a/samples/client/petstore/eiffel/docs/ANOTHERFAKE_API.md
+++ b/samples/client/petstore/eiffel/docs/ANOTHERFAKE_API.md
@ -4,23 +4,23 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*

 Feature | HTTP request | Description
 ------------- | ------------- | -------------
-[**test_special_tags**](ANOTHERFAKE_API.md#test_special_tags) | **Patch** /another-fake/dummy | To test special tags
+[**call123test_special_tags**](ANOTHERFAKE_API.md#call123test_special_tags) | **Patch** /another-fake/dummy | To test special tags


-# **test_special_tags**
-> test_special_tags (client: CLIENT ): detachable CLIENT
+# **call123test_special_tags**
+> call123test_special_tags (body: CLIENT ): detachable CLIENT
 	

 To test special tags

-To test special tags
+To test special tags and operation ID starting with number


 ### Parameters

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **client** | [**CLIENT**](CLIENT.md)| client model | 
+ **body** | [**CLIENT**](CLIENT.md)| client model | 

 ### Return type

--- a/samples/client/petstore/eiffel/docs/BIG_CAT.md
+++ b/samples/client/petstore/eiffel/docs/BIG_CAT.md
@ -0,0 +1,13 @@
+# BIG_CAT
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**class_name** | [**STRING_32**](STRING_32.md) |  | [default to null]
+**color** | [**STRING_32**](STRING_32.md) |  | [optional] [default to red]
+**declawed** | **BOOLEAN** |  | [optional] [default to null]
+**kind** | [**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)
+
+
--- a/samples/client/petstore/eiffel/docs/BIG_CAT_ALL_OF.md
+++ b/samples/client/petstore/eiffel/docs/BIG_CAT_ALL_OF.md
@ -1,8 +1,9 @@
-# OUTER_BOOLEAN
+# BIG_CAT_ALL_OF

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**kind** | [**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)

--- a/samples/client/petstore/eiffel/docs/CATEGORY.md
+++ b/samples/client/petstore/eiffel/docs/CATEGORY.md
@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **INTEGER_64** |  | [optional] [default to null]
-**name** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**name** | [**STRING_32**](STRING_32.md) |  | [default to default-name]

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/samples/client/petstore/eiffel/docs/ANIMAL_FARM.md
+++ b/samples/client/petstore/eiffel/docs/ANIMAL_FARM.md
@ -1,8 +1,9 @@
-# ANIMAL_FARM
+# CAT_ALL_OF

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**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)

--- a/samples/client/petstore/eiffel/docs/OUTER_STRING.md
+++ b/samples/client/petstore/eiffel/docs/OUTER_STRING.md
@ -1,8 +1,9 @@
-# OUTER_STRING
+# DOG_ALL_OF

 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**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)

--- a/samples/client/petstore/eiffel/docs/FAKECLASSNAMETAGS123_API.md
+++ b/samples/client/petstore/eiffel/docs/FAKECLASSNAMETAGS123_API.md
@ -8,7 +8,7 @@ Feature | HTTP request | Description


 # **test_classname**
-> test_classname (client: CLIENT ): detachable CLIENT
+> test_classname (body: CLIENT ): detachable CLIENT
 	

 To test class name in snake case
@ -20,7 +20,7 @@ To test class name in snake case

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **client** | [**CLIENT**](CLIENT.md)| client model | 
+ **body** | [**CLIENT**](CLIENT.md)| client model | 

 ### Return type

--- a/samples/client/petstore/eiffel/docs/FAKE_API.md
+++ b/samples/client/petstore/eiffel/docs/FAKE_API.md
@ -4,18 +4,52 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*

 Feature | HTTP request | Description
 ------------- | ------------- | -------------
+[**create_xml_item**](FAKE_API.md#create_xml_item) | **Post** /fake/create_xml_item | creates an XmlItem
 [**fake_outer_boolean_serialize**](FAKE_API.md#fake_outer_boolean_serialize) | **Post** /fake/outer/boolean | 
 [**fake_outer_composite_serialize**](FAKE_API.md#fake_outer_composite_serialize) | **Post** /fake/outer/composite | 
 [**fake_outer_number_serialize**](FAKE_API.md#fake_outer_number_serialize) | **Post** /fake/outer/number | 
 [**fake_outer_string_serialize**](FAKE_API.md#fake_outer_string_serialize) | **Post** /fake/outer/string | 
+[**test_body_with_file_schema**](FAKE_API.md#test_body_with_file_schema) | **Put** /fake/body-with-file-schema | 
 [**test_body_with_query_params**](FAKE_API.md#test_body_with_query_params) | **Put** /fake/body-with-query-params | 
 [**test_client_model**](FAKE_API.md#test_client_model) | **Patch** /fake | To test \&quot;client\&quot; model
-[**test_endpoint_parameters**](FAKE_API.md#test_endpoint_parameters) | **Post** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+[**test_endpoint_parameters**](FAKE_API.md#test_endpoint_parameters) | **Post** /fake | Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 [**test_enum_parameters**](FAKE_API.md#test_enum_parameters) | **Get** /fake | To test enum parameters
+[**test_group_parameters**](FAKE_API.md#test_group_parameters) | **Delete** /fake | Fake endpoint to test group parameters (optional)
 [**test_inline_additional_properties**](FAKE_API.md#test_inline_additional_properties) | **Post** /fake/inline-additionalProperties | test inline additionalProperties
 [**test_json_form_data**](FAKE_API.md#test_json_form_data) | **Get** /fake/jsonFormData | test json serialization of form data
+[**test_query_parameter_collection_format**](FAKE_API.md#test_query_parameter_collection_format) | **Put** /fake/test-query-paramters | 


+# **create_xml_item**
+> create_xml_item (xml_item: XML_ITEM )
+	
+
+creates an XmlItem
+
+this route creates an XmlItem
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **xml_item** | [**XML_ITEM**](XML_ITEM.md)| XmlItem Body | 
+
+### Return type
+
+{empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
+ - **Accept**: Not defined
+
+[[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)
+
 # **fake_outer_boolean_serialize**
 > fake_outer_boolean_serialize (body:  detachable BOOLEAN ): detachable BOOLEAN
 	
@ -47,7 +81,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)

 # **fake_outer_composite_serialize**
-> fake_outer_composite_serialize (outer_composite:  detachable OUTER_COMPOSITE ): detachable OUTER_COMPOSITE
+> fake_outer_composite_serialize (body:  detachable OUTER_COMPOSITE ): detachable OUTER_COMPOSITE
 	


@ -59,7 +93,7 @@ Test serialization of object with outer number type

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **outer_composite** | [**OUTER_COMPOSITE**](OUTER_COMPOSITE.md)| Input composite as post body | [optional] 
+ **body** | [**OUTER_COMPOSITE**](OUTER_COMPOSITE.md)| Input composite as post body | [optional] 

 ### Return type

@ -136,8 +170,38 @@ 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_body_with_file_schema**
+> test_body_with_file_schema (body: FILE_SCHEMA_TEST_CLASS )
+	
+
+
+
+For this test, the body for this request much reference a schema named `File`.
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FILE_SCHEMA_TEST_CLASS**](FILE_SCHEMA_TEST_CLASS.md)|  | 
+
+### Return type
+
+{empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+[[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_body_with_query_params**
-> test_body_with_query_params (query: STRING_32 ; user: USER )
+> test_body_with_query_params (query: STRING_32 ; body: USER )
 	


@ -147,8 +211,8 @@ No authorization required

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **query** | **STRING_32**|  | 
- **user** | [**USER**](USER.md)|  | 
+ **query** | **STRING_32**|  | [default to null]
+ **body** | [**USER**](USER.md)|  | 

 ### Return type

@ -166,7 +230,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_client_model**
-> test_client_model (client: CLIENT ): detachable CLIENT
+> test_client_model (body: CLIENT ): detachable CLIENT
 	

 To test \"client\" model
@ -178,7 +242,7 @@ To test \"client\" model

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **client** | [**CLIENT**](CLIENT.md)| client model | 
+ **body** | [**CLIENT**](CLIENT.md)| client model | 

 ### Return type

@ -196,12 +260,12 @@ 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_endpoint_parameters**
-> test_endpoint_parameters (number: REAL_32 ; double: REAL_64 ; pattern_without_delimiter: STRING_32 ; byte: ARRAY [NATURAL_8] ; integer:  detachable INTEGER_32 ; int32:  detachable INTEGER_32 ; int64:  detachable INTEGER_64 ; float:  detachable REAL_32 ; string:  detachable STRING_32 ; binary:  detachable FILE ; date:  detachable DATE ; date_time:  detachable DATE_TIME ; password:  detachable STRING_32 ; callback:  detachable STRING_32 )
+> test_endpoint_parameters (number: REAL_32 ; double: REAL_64 ; pattern_without_delimiter: STRING_32 ; byte: ARRAY [NATURAL_8] ; integer:  detachable INTEGER_32 ; int32:  detachable INTEGER_32 ; int64:  detachable INTEGER_64 ; float:  detachable REAL_32 ; string:  detachable STRING_32 ; binary:  detachable FILE ; date:  detachable DATE ; date_time:  detachable DATE_TIME ; password:  detachable STRING ; callback:  detachable STRING_32 )
 	

-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트

-Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트


 ### Parameters
@ -220,7 +284,7 @@ Name | Type | Description  | Notes
 **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]
+ **password** | **STRING**| None | [optional] [default to null]
 **callback** | **STRING_32**| None | [optional] [default to null]

 ### Return type
@ -251,13 +315,13 @@ To test enum parameters

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enum_header_string_array** | [**LIST [STRING_32]**](STRING_32.md)| Header parameter enum test (string array) | [optional] 
+ **enum_header_string_array** | [**LIST [STRING_32]**](STRING_32.md)| Header parameter enum test (string array) | [optional] [default to null]
 **enum_header_string** | **STRING_32**| Header parameter enum test (string) | [optional] [default to -efg]
- **enum_query_string_array** | [**LIST [STRING_32]**](STRING_32.md)| Query parameter enum test (string array) | [optional] 
+ **enum_query_string_array** | [**LIST [STRING_32]**](STRING_32.md)| Query parameter enum test (string array) | [optional] [default to null]
 **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]**| Form parameter enum test (string array) | [optional] [default to $]
+ **enum_query_integer** | **INTEGER_32**| Query parameter enum test (double) | [optional] [default to null]
+ **enum_query_double** | **REAL_64**| Query parameter enum test (double) | [optional] [default to null]
+ **enum_form_string_array** | [**LIST [STRING_32]**](STRING_32.md)| 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
@ -275,8 +339,43 @@ 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_group_parameters**
+> test_group_parameters (required_string_group: INTEGER_32 ; required_boolean_group: BOOLEAN ; required_int64_group: INTEGER_64 ; string_group:  detachable INTEGER_32 ; boolean_group:  detachable BOOLEAN ; int64_group:  detachable INTEGER_64 )
+	
+
+Fake endpoint to test group parameters (optional)
+
+Fake endpoint to test group parameters (optional)
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **required_string_group** | **INTEGER_32**| Required String in group parameters | [default to null]
+ **required_boolean_group** | **BOOLEAN**| Required Boolean in group parameters | [default to null]
+ **required_int64_group** | **INTEGER_64**| Required Integer in group parameters | [default to null]
+ **string_group** | **INTEGER_32**| String in group parameters | [optional] [default to null]
+ **boolean_group** | **BOOLEAN**| Boolean in group parameters | [optional] [default to null]
+ **int64_group** | **INTEGER_64**| Integer in group parameters | [optional] [default to null]
+
+### Return type
+
+{empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[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_TABLE[STRING_32] )
+> test_inline_additional_properties (param: STRING_TABLE [STRING_32] )
 	

 test inline additionalProperties
@ -286,7 +385,7 @@ test inline additionalProperties

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **request_body** | [**STRING_TABLE[STRING_32]**](STRING_32.md)| request body | 
+ **param** | [**STRING_TABLE [STRING_32]**](STRING_32.md)| request body | 

 ### Return type

@ -332,3 +431,37 @@ 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_query_parameter_collection_format**
+> test_query_parameter_collection_format (pipe: LIST [STRING_32] ; ioutil: LIST [STRING_32] ; http: LIST [STRING_32] ; url: LIST [STRING_32] ; context: LIST [STRING_32] )
+	
+
+
+
+To test the collection format in query parameters
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pipe** | [**LIST [STRING_32]**](STRING_32.md)|  | [default to null]
+ **ioutil** | [**LIST [STRING_32]**](STRING_32.md)|  | [default to null]
+ **http** | [**LIST [STRING_32]**](STRING_32.md)|  | [default to null]
+ **url** | [**LIST [STRING_32]**](STRING_32.md)|  | [default to null]
+ **context** | [**LIST [STRING_32]**](STRING_32.md)|  | [default to null]
+
+### Return type
+
+{empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[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)
+
--- a/samples/client/petstore/eiffel/docs/FAKE_CLASSNAME_TAGS123_API.md
+++ b/samples/client/petstore/eiffel/docs/FAKE_CLASSNAME_TAGS123_API.md
@ -1,37 +0,0 @@
-# FAKE_CLASSNAME_TAGS123_API
-
-All URIs are relative to *http://petstore.swagger.io:80/v2*
-
-Feature | HTTP request | Description
------------- | ------------- | -------------
-[**test_classname**](FAKE_CLASSNAME_TAGS123_API.md#test_classname) | **Patch** /fake_classname_test | To test class name in snake case
-
-
-# **test_classname**
-> test_classname (body: CLIENT ): detachable CLIENT
-	
-
-To test class name in snake case
-
-
-### Parameters
-
-Name | Type | Description  | Notes
------------- | ------------- | ------------- | -------------
- **body** | [**CLIENT**](CLIENT.md)| client model | 
-
-### Return type
-
-[**CLIENT**](Client.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
--- a/samples/client/petstore/eiffel/docs/FILE_SCHEMA_TEST_CLASS.md
+++ b/samples/client/petstore/eiffel/docs/FILE_SCHEMA_TEST_CLASS.md
@ -0,0 +1,11 @@
+# FILE_SCHEMA_TEST_CLASS
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**file** | [**FILE**](FILE.md) |  | [optional] [default to null]
+**files** | [**LIST [FILE]**](FILE.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)
+
+
--- a/samples/client/petstore/eiffel/docs/FORMAT_TEST.md
+++ b/samples/client/petstore/eiffel/docs/FORMAT_TEST.md
@ -15,7 +15,8 @@ Name | Type | Description | Notes
 **date** | [**DATE**](DATE.md) |  | [default to null]
 **date_time** | [**DATE_TIME**](DATE_TIME.md) |  | [optional] [default to null]
 **uuid** | [**UUID**](UUID.md) |  | [optional] [default to null]
-**password** | [**STRING_32**](STRING_32.md) |  | [default to null]
+**password** | [**STRING**](STRING.md) |  | [default to null]
+**big_decimal** | **REAL_64** |  | [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)

--- a/samples/client/petstore/eiffel/docs/HAS_ONLY_READ_ONLY.md
+++ b/samples/client/petstore/eiffel/docs/HAS_ONLY_READ_ONLY.md
@ -3,8 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**bar** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
-**foo** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**bar** | [**STRING_32**](STRING_32.md) |  | [optional] [readonly] [default to null]
+**foo** | [**STRING_32**](STRING_32.md) |  | [optional] [readonly] [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)

--- a/samples/client/petstore/eiffel/docs/INLINE_OBJECT.md
+++ b/samples/client/petstore/eiffel/docs/INLINE_OBJECT.md
@ -0,0 +1,11 @@
+# INLINE_OBJECT
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | [**STRING_32**](STRING_32.md) | Updated name of the pet | [optional] [default to null]
+**status** | [**STRING_32**](STRING_32.md) | Updated status of the pet | [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)
+
+
--- a/samples/client/petstore/eiffel/docs/INLINE_OBJECT_1.md
+++ b/samples/client/petstore/eiffel/docs/INLINE_OBJECT_1.md
@ -0,0 +1,11 @@
+# INLINE_OBJECT_1
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**additional_metadata** | [**STRING_32**](STRING_32.md) | Additional data to pass to server | [optional] [default to null]
+**file** | [**FILE**](FILE.md) | file to upload | [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)
+
+
--- a/samples/client/petstore/eiffel/docs/MAP_TEST.md
+++ b/samples/client/petstore/eiffel/docs/MAP_TEST.md
@ -3,8 +3,10 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**map_map_of_string** | [**STRING_TABLE[STRING_TABLE[STRING_32]]**](STRING_TABLE.md) |  | [optional] [default to null]
-**map_of_enum_string** | [**STRING_TABLE[STRING_32]**](STRING_32.md) |  | [optional] [default to null]
+**map_map_of_string** | [**STRING_TABLE [STRING_TABLE [STRING_32]]**](STRING_TABLE.md) |  | [optional] [default to null]
+**map_of_enum_string** | [**STRING_TABLE [STRING_32]**](STRING_32.md) |  | [optional] [default to null]
+**direct_map** | **STRING_TABLE [BOOLEAN]** |  | [optional] [default to null]
+**indirect_map** | **STRING_TABLE [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)

--- a/samples/client/petstore/eiffel/docs/MIXED_PROPERTIES_AND_ADDITIONAL_PROPERTIES_CLASS.md
+++ b/samples/client/petstore/eiffel/docs/MIXED_PROPERTIES_AND_ADDITIONAL_PROPERTIES_CLASS.md
@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **uuid** | [**UUID**](UUID.md) |  | [optional] [default to null]
 **date_time** | [**DATE_TIME**](DATE_TIME.md) |  | [optional] [default to null]
-**map** | [**STRING_TABLE[ANIMAL]**](Animal.md) |  | [optional] [default to null]
+**map** | [**STRING_TABLE [ANIMAL]**](Animal.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)

--- a/samples/client/petstore/eiffel/docs/NAME.md
+++ b/samples/client/petstore/eiffel/docs/NAME.md
@ -4,9 +4,9 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **INTEGER_32** |  | [default to null]
-**snake_case** | **INTEGER_32** |  | [optional] [default to null]
+**snake_case** | **INTEGER_32** |  | [optional] [readonly] [default to null]
 **property** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
-**var_123_number** | **INTEGER_32** |  | [optional] [default to null]
+**var_123_number** | **INTEGER_32** |  | [optional] [readonly] [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)

--- a/samples/client/petstore/eiffel/docs/PET_API.md
+++ b/samples/client/petstore/eiffel/docs/PET_API.md
@ -12,10 +12,11 @@ Feature | HTTP request | Description
 [**update_pet**](PET_API.md#update_pet) | **Put** /pet | Update an existing pet
 [**update_pet_with_form**](PET_API.md#update_pet_with_form) | **Post** /pet/{petId} | Updates a pet in the store with form data
 [**upload_file**](PET_API.md#upload_file) | **Post** /pet/{petId}/uploadImage | uploads an image
+[**upload_file_with_required_file**](PET_API.md#upload_file_with_required_file) | **Post** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)


 # **add_pet**
-> add_pet (pet: PET )
+> add_pet (body: PET )
 	

 Add a new pet to the store
@ -25,7 +26,7 @@ Add a new pet to the store

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**PET**](PET.md)| Pet object that needs to be added to the store | 
+ **body** | [**PET**](PET.md)| Pet object that needs to be added to the store | 

 ### Return type

@ -53,8 +54,8 @@ Deletes a pet

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **INTEGER_64**| Pet id to delete | 
- **api_key** | **STRING_32**|  | [optional] 
+ **pet_id** | **INTEGER_64**| Pet id to delete | [default to null]
+ **api_key** | **STRING_32**|  | [optional] [default to null]

 ### Return type

@ -84,7 +85,7 @@ Multiple status values can be provided with comma separated strings

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**LIST [STRING_32]**](STRING_32.md)| Status values that need to be considered for filter | 
+ **status** | [**LIST [STRING_32]**](STRING_32.md)| Status values that need to be considered for filter | [default to null]

 ### Return type

@ -114,7 +115,7 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**LIST [STRING_32]**](STRING_32.md)| Tags to filter by | 
+ **tags** | [**LIST [STRING_32]**](STRING_32.md)| Tags to filter by | [default to null]

 ### Return type

@ -144,7 +145,7 @@ Returns a single pet

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **INTEGER_64**| ID of pet to return | 
+ **pet_id** | **INTEGER_64**| ID of pet to return | [default to null]

 ### Return type

@ -162,7 +163,7 @@ Name | Type | Description  | Notes
 [[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)

 # **update_pet**
-> update_pet (pet: PET )
+> update_pet (body: PET )
 	

 Update an existing pet
@ -172,7 +173,7 @@ Update an existing pet

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**PET**](PET.md)| Pet object that needs to be added to the store | 
+ **body** | [**PET**](PET.md)| Pet object that needs to be added to the store | 

 ### Return type

@ -200,7 +201,7 @@ 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 | 
+ **pet_id** | **INTEGER_64**| ID of pet that needs to be updated | [default to null]
 **name** | **STRING_32**| Updated name of the pet | [optional] [default to null]
 **status** | **STRING_32**| Updated status of the pet | [optional] [default to null]

@ -230,7 +231,7 @@ uploads an image

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet_id** | **INTEGER_64**| ID of pet to update | 
+ **pet_id** | **INTEGER_64**| ID of pet to update | [default to null]
 **additional_metadata** | **STRING_32**| Additional data to pass to server | [optional] [default to null]
 **file** | **FILE**| file to upload | [optional] [default to null]

@ -249,3 +250,33 @@ Name | Type | Description  | Notes

 [[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)

+# **upload_file_with_required_file**
+> upload_file_with_required_file (pet_id: INTEGER_64 ; required_file: FILE ; additional_metadata:  detachable STRING_32 ): detachable API_RESPONSE
+	
+
+uploads an image (required)
+
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **pet_id** | **INTEGER_64**| ID of pet to update | [default to null]
+ **required_file** | **FILE**| file to upload | [default to null]
+ **additional_metadata** | **STRING_32**| Additional data to pass to server | [optional] [default to null]
+
+### Return type
+
+[**API_RESPONSE**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
+[[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)
+
--- a/samples/client/petstore/eiffel/docs/READ_ONLY_FIRST.md
+++ b/samples/client/petstore/eiffel/docs/READ_ONLY_FIRST.md
@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**bar** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**bar** | [**STRING_32**](STRING_32.md) |  | [optional] [readonly] [default to null]
 **baz** | [**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)
--- a/samples/client/petstore/eiffel/docs/STORE_API.md
+++ b/samples/client/petstore/eiffel/docs/STORE_API.md
@ -23,7 +23,7 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or non

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order_id** | **STRING_32**| ID of the order that needs to be deleted | 
+ **order_id** | **STRING_32**| ID of the order that needs to be deleted | [default to null]

 ### Return type

@ -41,7 +41,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)

 # **inventory**
-> inventory : detachable STRING_TABLE[INTEGER_32]
+> inventory : detachable STRING_TABLE [INTEGER_32]
 	

 Returns pet inventories by status
@ -54,7 +54,7 @@ This endpoint does not need any parameter.

 ### Return type

-**STRING_TABLE[INTEGER_32]**
+**STRING_TABLE [INTEGER_32]**

 ### Authorization

@ -80,7 +80,7 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order_id** | **INTEGER_64**| ID of pet that needs to be fetched | 
+ **order_id** | **INTEGER_64**| ID of pet that needs to be fetched | [default to null]

 ### Return type

@ -98,7 +98,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)

 # **place_order**
-> place_order (order: ORDER ): detachable ORDER
+> place_order (body: ORDER ): detachable ORDER
 	

 Place an order for a pet
@ -108,7 +108,7 @@ Place an order for a pet

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order** | [**ORDER**](ORDER.md)| order placed for purchasing the pet | 
+ **body** | [**ORDER**](ORDER.md)| order placed for purchasing the pet | 

 ### Return type

--- a/samples/client/petstore/eiffel/docs/TYPE_HOLDER_DEFAULT.md
+++ b/samples/client/petstore/eiffel/docs/TYPE_HOLDER_DEFAULT.md
@ -0,0 +1,14 @@
+# TYPE_HOLDER_DEFAULT
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**string_item** | [**STRING_32**](STRING_32.md) |  | [default to what]
+**number_item** | **REAL_32** |  | [default to null]
+**integer_item** | **INTEGER_32** |  | [default to null]
+**bool_item** | **BOOLEAN** |  | [default to true]
+**array_item** | **LIST [INTEGER_32]** |  | [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)
+
+
--- a/samples/client/petstore/eiffel/docs/TYPE_HOLDER_EXAMPLE.md
+++ b/samples/client/petstore/eiffel/docs/TYPE_HOLDER_EXAMPLE.md
@ -0,0 +1,15 @@
+# TYPE_HOLDER_EXAMPLE
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**string_item** | [**STRING_32**](STRING_32.md) |  | [default to null]
+**number_item** | **REAL_32** |  | [default to null]
+**float_item** | **REAL_32** |  | [default to null]
+**integer_item** | **INTEGER_32** |  | [default to null]
+**bool_item** | **BOOLEAN** |  | [default to null]
+**array_item** | **LIST [INTEGER_32]** |  | [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)
+
+
--- a/samples/client/petstore/eiffel/docs/USER_API.md
+++ b/samples/client/petstore/eiffel/docs/USER_API.md
@ -15,7 +15,7 @@ Feature | HTTP request | Description


 # **create_user**
-> create_user (user: USER )
+> create_user (body: USER )
 	

 Create user
@ -27,7 +27,7 @@ This can only be done by the logged in user.

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**USER**](USER.md)| Created user object | 
+ **body** | [**USER**](USER.md)| Created user object | 

 ### Return type

@ -45,7 +45,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)

 # **create_users_with_array_input**
-> create_users_with_array_input (user: LIST [USER] )
+> create_users_with_array_input (body: LIST [USER] )
 	

 Creates list of users with given input array
@ -55,7 +55,7 @@ Creates list of users with given input array

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**LIST [USER]**](LIST.md)| List of user object | 
+ **body** | [**LIST [USER]**](User.md)| List of user object | 

 ### Return type

@ -73,7 +73,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)

 # **create_users_with_list_input**
-> create_users_with_list_input (user: LIST [USER] )
+> create_users_with_list_input (body: LIST [USER] )
 	

 Creates list of users with given input array
@ -83,7 +83,7 @@ Creates list of users with given input array

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**LIST [USER]**](LIST.md)| List of user object | 
+ **body** | [**LIST [USER]**](User.md)| List of user object | 

 ### Return type

@ -113,7 +113,7 @@ This can only be done by the logged in user.

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **STRING_32**| The name that needs to be deleted | 
+ **username** | **STRING_32**| The name that needs to be deleted | [default to null]

 ### Return type

@ -141,8 +141,8 @@ Logs user into the system

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **STRING_32**| The user name for login | 
- **password** | **STRING_32**| The password for login in clear text | 
+ **username** | **STRING_32**| The user name for login | [default to null]
+ **password** | **STRING_32**| The password for login in clear text | [default to null]

 ### Return type

@ -185,7 +185,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)

 # **update_user**
-> update_user (username: STRING_32 ; user: USER )
+> update_user (username: STRING_32 ; body: USER )
 	

 Updated user
@ -197,8 +197,8 @@ This can only be done by the logged in user.

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **STRING_32**| name that need to be deleted | 
- **user** | [**USER**](USER.md)| Updated user object | 
+ **username** | **STRING_32**| name that need to be deleted | [default to null]
+ **body** | [**USER**](USER.md)| Updated user object | 

 ### Return type

@ -226,7 +226,7 @@ Get user by user name

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **username** | **STRING_32**| The name that needs to be fetched. Use user1 for testing. | 
+ **username** | **STRING_32**| The name that needs to be fetched. Use user1 for testing. | [default to null]

 ### Return type

--- a/samples/client/petstore/eiffel/docs/XML_ITEM.md
+++ b/samples/client/petstore/eiffel/docs/XML_ITEM.md
@ -0,0 +1,38 @@
+# XML_ITEM
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**attribute_string** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**attribute_number** | **REAL_32** |  | [optional] [default to null]
+**attribute_integer** | **INTEGER_32** |  | [optional] [default to null]
+**attribute_boolean** | **BOOLEAN** |  | [optional] [default to null]
+**wrapped_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**name_string** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**name_number** | **REAL_32** |  | [optional] [default to null]
+**name_integer** | **INTEGER_32** |  | [optional] [default to null]
+**name_boolean** | **BOOLEAN** |  | [optional] [default to null]
+**name_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**name_wrapped_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**prefix_string** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**prefix_number** | **REAL_32** |  | [optional] [default to null]
+**prefix_integer** | **INTEGER_32** |  | [optional] [default to null]
+**prefix_boolean** | **BOOLEAN** |  | [optional] [default to null]
+**prefix_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**prefix_wrapped_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**namespace_string** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**namespace_number** | **REAL_32** |  | [optional] [default to null]
+**namespace_integer** | **INTEGER_32** |  | [optional] [default to null]
+**namespace_boolean** | **BOOLEAN** |  | [optional] [default to null]
+**namespace_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**namespace_wrapped_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**prefix_ns_string** | [**STRING_32**](STRING_32.md) |  | [optional] [default to null]
+**prefix_ns_number** | **REAL_32** |  | [optional] [default to null]
+**prefix_ns_integer** | **INTEGER_32** |  | [optional] [default to null]
+**prefix_ns_boolean** | **BOOLEAN** |  | [optional] [default to null]
+**prefix_ns_array** | **LIST [INTEGER_32]** |  | [optional] [default to null]
+**prefix_ns_wrapped_array** | **LIST [INTEGER_32]** |  | [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)
+
+
--- a/samples/client/petstore/eiffel/src/api/another_fake_api.e
+++ b/samples/client/petstore/eiffel/src/api/another_fake_api.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -24,11 +24,11 @@ inherit
 feature -- API Access


-	test_special_tags (client: CLIENT): detachable CLIENT
-			-- To test special tags
+	call123test_special_tags (body: CLIENT): detachable CLIENT
 			-- To test special tags
+			-- To test special tags and operation ID starting with number
 			-- 
-			-- argument: client client model (required)
+			-- argument: body client model (required)
 			-- 
 			-- 
 			-- Result CLIENT
@ -40,15 +40,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(client)
+			l_request.set_body(body)
 			l_path := "/another-fake/dummy"


-			if attached {STRING} api_client.select_header_accept (<<"application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/json">>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Patch", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
--- a/samples/client/petstore/eiffel/src/api/fake_api.e
+++ b/samples/client/petstore/eiffel/src/api/fake_api.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -24,6 +24,36 @@ inherit
 feature -- API Access


+	create_xml_item (xml_item: XML_ITEM)
+			-- creates an XmlItem
+			-- this route creates an XmlItem
+			-- 
+			-- argument: xml_item XmlItem Body (required)
+			-- 
+			-- 
+		require
+		local
+  			l_path: STRING
+  			l_request: API_CLIENT_REQUEST
+  			l_response: API_CLIENT_RESPONSE
+		do
+			reset_error
+			create l_request
+			l_request.set_body(xml_item)
+			l_path := "/fake/create_xml_item"
+
+
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
+				l_request.add_header(l_accept,"Accept");
+			end
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
+			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
+			if l_response.has_error then
+				last_error := l_response.error
+			end
+		end	
+
 	fake_outer_boolean_serialize (body: BOOLEAN): detachable BOOLEAN
 			-- 
 			-- Test serialization of outer boolean types
@ -44,11 +74,11 @@ feature -- API Access
 			l_path := "/fake/outer/boolean"


-			if attached {STRING} api_client.select_header_accept (<<"*/*">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"*/*">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -59,11 +89,11 @@ feature -- API Access
 			end
 		end	

-	fake_outer_composite_serialize (outer_composite: detachable OUTER_COMPOSITE): detachable OUTER_COMPOSITE
+	fake_outer_composite_serialize (body: detachable OUTER_COMPOSITE): detachable OUTER_COMPOSITE
 			-- 
 			-- Test serialization of object with outer number type
 			-- 
-			-- argument: outer_composite Input composite as post body (optional)
+			-- argument: body Input composite as post body (optional)
 			-- 
 			-- 
 			-- Result OUTER_COMPOSITE
@ -75,15 +105,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(outer_composite)
+			l_request.set_body(body)
 			l_path := "/fake/outer/composite"


-			if attached {STRING} api_client.select_header_accept (<<"*/*">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"*/*">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -114,11 +144,11 @@ feature -- API Access
 			l_path := "/fake/outer/number"


-			if attached {STRING} api_client.select_header_accept (<<"*/*">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"*/*">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -149,11 +179,11 @@ feature -- API Access
 			l_path := "/fake/outer/string"


-			if attached {STRING} api_client.select_header_accept (<<"*/*">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"*/*">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -164,13 +194,11 @@ feature -- API Access
 			end
 		end	

-	test_body_with_query_params (query: STRING_32; user: USER)
+	test_body_with_file_schema (body: FILE_SCHEMA_TEST_CLASS)
 			-- 
+			-- For this test, the body for this request much reference a schema named &#x60;File&#x60;.
 			-- 
-			-- 
-			-- argument: query  (required)
-			-- 
-			-- argument: user  (required)
+			-- argument: body  (required)
 			-- 
 			-- 
 		require
@ -181,27 +209,59 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(user)
-			l_path := "/fake/body-with-query-params"
-			l_request.fill_query_params(api_client.parameter_to_tuple("", "query", query));
+			l_request.set_body(body)
+			l_path := "/fake/body-with-file-schema"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/json">>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Put", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			end
 		end	

-	test_client_model (client: CLIENT): detachable CLIENT
+	test_body_with_query_params (query: STRING_32; body: USER)
+			-- 
+			-- 
+			-- 
+			-- argument: query  (required)
+			-- 
+			-- argument: body  (required)
+			-- 
+			-- 
+		require
+		local
+  			l_path: STRING
+  			l_request: API_CLIENT_REQUEST
+  			l_response: API_CLIENT_RESPONSE
+		do
+			reset_error
+			create l_request
+			l_request.set_body(body)
+			l_path := "/fake/body-with-query-params"
+			l_request.fill_query_params(api_client.parameter_to_tuple("", "query", query));
+
+
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
+				l_request.add_header(l_accept,"Accept");
+			end
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
+			l_response := api_client.call_api (l_path, "Put", l_request, agent serializer, Void)
+			if l_response.has_error then
+				last_error := l_response.error
+			end
+		end	
+
+	test_client_model (body: CLIENT): detachable CLIENT
 			-- To test \&quot;client\&quot; model
 			-- To test \&quot;client\&quot; model
 			-- 
-			-- argument: client client model (required)
+			-- argument: body client model (required)
 			-- 
 			-- 
 			-- Result CLIENT
@ -213,15 +273,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(client)
+			l_request.set_body(body)
 			l_path := "/fake"


-			if attached {STRING} api_client.select_header_accept (<<"application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/json">>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Patch", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -232,9 +292,9 @@ feature -- API Access
 			end
 		end	

-	test_endpoint_parameters (number: REAL_32; double: REAL_64; pattern_without_delimiter: STRING_32; byte: ARRAY [NATURAL_8]; integer: INTEGER_32; int32: INTEGER_32; int64: INTEGER_64; float: REAL_32; string: STRING_32; binary: FILE; date: DATE; date_time: DATE_TIME; password: STRING_32; callback: STRING_32)
-			-- Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-			-- Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+	test_endpoint_parameters (number: REAL_32; double: REAL_64; pattern_without_delimiter: STRING_32; byte: ARRAY [NATURAL_8]; integer: INTEGER_32; int32: INTEGER_32; int64: INTEGER_64; float: REAL_32; string: STRING_32; binary: FILE; date: DATE; date_time: DATE_TIME; password: STRING; callback: STRING_32)
+			-- Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
+			-- Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 			-- 
 			-- argument: number None (required)
 			-- 
@ -328,32 +388,32 @@ feature -- API Access
 				l_request.add_form(l_callback,"callback");
 			end

-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/x-www-form-urlencoded">>),"Content-Type")
-			l_request.set_auth_names (<<"http_basic_test">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/x-www-form-urlencoded">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"http_basic_test">>)
 			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			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: 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: detachable LIST [STRING_32]; enum_form_string: STRING_32)
 			-- To test enum parameters
 			-- To test enum parameters
 			-- 
-			-- argument: enum_header_string_array Header parameter enum test (string array) (optional)
+			-- argument: enum_header_string_array Header parameter enum test (string array) (optional, default to null)
 			-- 
 			-- argument: enum_header_string Header parameter enum test (string) (optional, default to -efg)
 			-- 
-			-- argument: enum_query_string_array Query parameter enum test (string array) (optional)
+			-- argument: enum_query_string_array Query parameter enum test (string array) (optional, default to null)
 			-- 
 			-- argument: enum_query_string Query parameter enum test (string) (optional, default to -efg)
 			-- 
-			-- argument: enum_query_integer Query parameter enum test (double) (optional)
+			-- argument: enum_query_integer Query parameter enum test (double) (optional, default to null)
 			-- 
-			-- argument: enum_query_double Query parameter enum test (double) (optional)
+			-- argument: enum_query_double Query parameter enum test (double) (optional, default to null)
 			-- 
 			-- argument: enum_form_string_array Form parameter enum test (string array) (optional, default to $)
 			-- 
@ -388,22 +448,32 @@ feature -- API Access
 				l_request.add_form(l_enum_form_string,"enum_form_string");
 			end

-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/x-www-form-urlencoded">>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/x-www-form-urlencoded">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Get", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			end
 		end	

-	test_inline_additional_properties (request_body: STRING_TABLE[STRING_32])
-			-- test inline additionalProperties
+	test_group_parameters (required_string_group: INTEGER_32; required_boolean_group: BOOLEAN; required_int64_group: INTEGER_64; string_group: INTEGER_32; boolean_group: BOOLEAN; int64_group: INTEGER_64)
+			-- Fake endpoint to test group parameters (optional)
+			-- Fake endpoint to test group parameters (optional)
 			-- 
+			-- argument: required_string_group Required String in group parameters (required)
 			-- 
-			-- argument: request_body request body (required)
+			-- argument: required_boolean_group Required Boolean in group parameters (required)
+			-- 
+			-- argument: required_int64_group Required Integer in group parameters (required)
+			-- 
+			-- argument: string_group String in group parameters (optional, default to null)
+			-- 
+			-- argument: boolean_group Boolean in group parameters (optional, default to null)
+			-- 
+			-- argument: int64_group Integer in group parameters (optional, default to null)
 			-- 
 			-- 
 		require
@ -414,15 +484,55 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(request_body)
+			
+			l_path := "/fake"
+			l_request.fill_query_params(api_client.parameter_to_tuple("", "required_string_group", required_string_group));
+			l_request.fill_query_params(api_client.parameter_to_tuple("", "required_int64_group", required_int64_group));
+			l_request.fill_query_params(api_client.parameter_to_tuple("", "string_group", string_group));
+			l_request.fill_query_params(api_client.parameter_to_tuple("", "int64_group", int64_group));
+
+			if attached required_boolean_group as l_required_boolean_group then
+				l_request.add_header(l_required_boolean_group.out,"required_boolean_group");
+			end
+			if attached boolean_group as l_boolean_group then
+				l_request.add_header(l_boolean_group.out,"boolean_group");
+			end
+
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
+				l_request.add_header(l_accept,"Accept");
+			end
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
+			l_response := api_client.call_api (l_path, "Delete", l_request, agent serializer, Void)
+			if l_response.has_error then
+				last_error := l_response.error
+			end
+		end	
+
+	test_inline_additional_properties (param: STRING_TABLE [STRING_32])
+			-- test inline additionalProperties
+			-- 
+			-- 
+			-- argument: param request body (required)
+			-- 
+			-- 
+		require
+		local
+  			l_path: STRING
+  			l_request: API_CLIENT_REQUEST
+  			l_response: API_CLIENT_RESPONSE
+		do
+			reset_error
+			create l_request
+			l_request.set_body(param)
 			l_path := "/fake/inline-additionalProperties"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/json">>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -456,16 +566,59 @@ feature -- API Access
 				l_request.add_form(l_param2,"param2");
 			end

-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/x-www-form-urlencoded">>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/x-www-form-urlencoded">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Get", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			end
 		end	

+	test_query_parameter_collection_format (pipe: LIST [STRING_32]; ioutil: LIST [STRING_32]; http: LIST [STRING_32]; url: LIST [STRING_32]; context: LIST [STRING_32])
+			-- 
+			-- To test the collection format in query parameters
+			-- 
+			-- argument: pipe  (required)
+			-- 
+			-- argument: ioutil  (required)
+			-- 
+			-- argument: http  (required)
+			-- 
+			-- argument: url  (required)
+			-- 
+			-- argument: context  (required)
+			-- 
+			-- 
+		require
+		local
+  			l_path: STRING
+  			l_request: API_CLIENT_REQUEST
+  			l_response: API_CLIENT_RESPONSE
+		do
+			reset_error
+			create l_request
+			
+			l_path := "/fake/test-query-paramters"
+			l_request.fill_query_params(api_client.parameter_to_tuple("csv", "pipe", pipe));
+			l_request.fill_query_params(api_client.parameter_to_tuple("csv", "ioutil", ioutil));
+			l_request.fill_query_params(api_client.parameter_to_tuple("ssv", "http", http));
+			l_request.fill_query_params(api_client.parameter_to_tuple("csv", "url", url));
+			l_request.fill_query_params(api_client.parameter_to_tuple("multi", "context", context));
+
+
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
+				l_request.add_header(l_accept,"Accept");
+			end
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
+			l_response := api_client.call_api (l_path, "Put", l_request, agent serializer, Void)
+			if l_response.has_error then
+				last_error := l_response.error
+			end
+		end	
+

 end
--- a/samples/client/petstore/eiffel/src/api/fake_classname_tags123_api.e
+++ b/samples/client/petstore/eiffel/src/api/fake_classname_tags123_api.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -24,11 +24,11 @@ inherit
 feature -- API Access


-	test_classname (client: CLIENT): detachable CLIENT
+	test_classname (body: CLIENT): detachable CLIENT
 			-- To test class name in snake case
 			-- To test class name in snake case
 			-- 
-			-- argument: client client model (required)
+			-- argument: body client model (required)
 			-- 
 			-- 
 			-- Result CLIENT
@ -40,15 +40,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(client)
+			l_request.set_body(body)
 			l_path := "/fake_classname_test"


-			if attached {STRING} api_client.select_header_accept (<<"application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/json">>),"Content-Type")
-			l_request.set_auth_names (<<"api_key_query">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"api_key_query">>)
 			l_response := api_client.call_api (l_path, "Patch", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
--- a/samples/client/petstore/eiffel/src/api/pet_api.e
+++ b/samples/client/petstore/eiffel/src/api/pet_api.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -24,11 +24,11 @@ inherit
 feature -- API Access


-	add_pet (pet: PET)
+	add_pet (body: PET)
 			-- Add a new pet to the store
 			-- 
 			-- 
-			-- argument: pet Pet object that needs to be added to the store (required)
+			-- argument: body Pet object that needs to be added to the store (required)
 			-- 
 			-- 
 		require
@ -39,15 +39,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(pet)
+			l_request.set_body(body)
 			l_path := "/pet"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/json", "application/xml">>),"Content-Type")
-			l_request.set_auth_names (<<"petstore_auth">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json", "application/xml">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
 			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -60,7 +60,7 @@ feature -- API Access
 			-- 
 			-- argument: pet_id Pet id to delete (required)
 			-- 
-			-- argument: api_key  (optional)
+			-- argument: api_key  (optional, default to null)
 			-- 
 			-- 
 		require
@ -79,11 +79,11 @@ feature -- API Access
 				l_request.add_header(l_api_key.out,"api_key");
 			end

-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<"petstore_auth">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
 			l_response := api_client.call_api (l_path, "Delete", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -111,11 +111,11 @@ feature -- API Access
 			l_request.fill_query_params(api_client.parameter_to_tuple("csv", "status", status));


-			if attached {STRING} api_client.select_header_accept (<<"application/xml", "application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/xml", "application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<"petstore_auth">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
 			l_response := api_client.call_api (l_path, "Get", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -147,11 +147,11 @@ feature -- API Access
 			l_request.fill_query_params(api_client.parameter_to_tuple("csv", "tags", tags));


-			if attached {STRING} api_client.select_header_accept (<<"application/xml", "application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/xml", "application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<"petstore_auth">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
 			l_response := api_client.call_api (l_path, "Get", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -183,11 +183,11 @@ feature -- API Access
 			l_path.replace_substring_all ("{"+"petId"+"}", api_client.url_encode (pet_id.out))


-			if attached {STRING} api_client.select_header_accept (<<"application/xml", "application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/xml", "application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<"api_key">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"api_key">>)
 			l_response := api_client.call_api (l_path, "Get", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -198,11 +198,11 @@ feature -- API Access
 			end
 		end	

-	update_pet (pet: PET)
+	update_pet (body: PET)
 			-- Update an existing pet
 			-- 
 			-- 
-			-- argument: pet Pet object that needs to be added to the store (required)
+			-- argument: body Pet object that needs to be added to the store (required)
 			-- 
 			-- 
 		require
@ -213,15 +213,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(pet)
+			l_request.set_body(body)
 			l_path := "/pet"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/json", "application/xml">>),"Content-Type")
-			l_request.set_auth_names (<<"petstore_auth">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/json", "application/xml">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
 			l_response := api_client.call_api (l_path, "Put", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -258,11 +258,11 @@ feature -- API Access
 				l_request.add_form(l_status,"status");
 			end

-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"application/x-www-form-urlencoded">>),"Content-Type")
-			l_request.set_auth_names (<<"petstore_auth">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"application/x-www-form-urlencoded">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
 			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -300,11 +300,57 @@ feature -- API Access
 				l_request.add_form(l_file,"file");
 			end

-			if attached {STRING} api_client.select_header_accept (<<"application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<"multipart/form-data">>),"Content-Type")
-			l_request.set_auth_names (<<"petstore_auth">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"multipart/form-data">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
+			l_response := api_client.call_api (l_path, "Post", l_request, Void, agent deserializer)
+			if l_response.has_error then
+				last_error := l_response.error
+			elseif attached { API_RESPONSE } l_response.data ({ API_RESPONSE }) as l_data then
+				Result := l_data
+			else
+				create last_error.make ("Unknown error: Status response [ " + l_response.status.out + "]")
+			end
+		end	
+
+	upload_file_with_required_file (pet_id: INTEGER_64; required_file: FILE; additional_metadata: STRING_32): detachable API_RESPONSE
+			-- uploads an image (required)
+			-- 
+			-- 
+			-- argument: pet_id ID of pet to update (required)
+			-- 
+			-- argument: required_file file to upload (required)
+			-- 
+			-- argument: additional_metadata Additional data to pass to server (optional, default to null)
+			-- 
+			-- 
+			-- Result API_RESPONSE
+		require
+		local
+  			l_path: STRING
+  			l_request: API_CLIENT_REQUEST
+  			l_response: API_CLIENT_RESPONSE
+		do
+			reset_error
+			create l_request
+			
+			l_path := "/fake/{petId}/uploadImageWithRequiredFile"
+			l_path.replace_substring_all ("{"+"petId"+"}", api_client.url_encode (pet_id.out))
+
+			if attached additional_metadata as l_additional_metadata then
+				l_request.add_form(l_additional_metadata,"additionalMetadata");
+			end
+			if attached required_file as l_required_file then
+				l_request.add_form(l_required_file,"requiredFile");
+			end
+
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/json">>)  as l_accept then
+				l_request.add_header(l_accept,"Accept");
+			end
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<"multipart/form-data">>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"petstore_auth">>)
 			l_response := api_client.call_api (l_path, "Post", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
--- a/samples/client/petstore/eiffel/src/api/store_api.e
+++ b/samples/client/petstore/eiffel/src/api/store_api.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -44,23 +44,23 @@ feature -- API Access
 			l_path.replace_substring_all ("{"+"order_id"+"}", api_client.url_encode (order_id.out))


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Delete", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			end
 		end	

-	inventory : detachable STRING_TABLE[INTEGER_32]
+	inventory : detachable STRING_TABLE [INTEGER_32]
 			-- Returns pet inventories by status
 			-- Returns a map of status codes to quantities
 			-- 
 			-- 
-			-- Result STRING_TABLE[INTEGER_32]
+			-- Result STRING_TABLE [INTEGER_32]
 		require
 		local
  			l_path: STRING
@ -73,15 +73,15 @@ feature -- API Access
 			l_path := "/store/inventory"


-			if attached {STRING} api_client.select_header_accept (<<"application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<"api_key">>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<"api_key">>)
 			l_response := api_client.call_api (l_path, "Get", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
-			elseif attached { STRING_TABLE[INTEGER_32] } l_response.data ({ STRING_TABLE[INTEGER_32] }) as l_data then
+			elseif attached { STRING_TABLE [INTEGER_32] } l_response.data ({ STRING_TABLE [INTEGER_32] }) as l_data then
 				Result := l_data
 			else
 				create last_error.make ("Unknown error: Status response [ " + l_response.status.out + "]")
@ -111,11 +111,11 @@ feature -- API Access
 			l_path.replace_substring_all ("{"+"order_id"+"}", api_client.url_encode (order_id.out))


-			if attached {STRING} api_client.select_header_accept (<<"application/xml", "application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/xml", "application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Get", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -126,11 +126,11 @@ feature -- API Access
 			end
 		end	

-	place_order (order: ORDER): detachable ORDER
+	place_order (body: ORDER): detachable ORDER
 			-- Place an order for a pet
 			-- 
 			-- 
-			-- argument: order order placed for purchasing the pet (required)
+			-- argument: body order placed for purchasing the pet (required)
 			-- 
 			-- 
 			-- Result ORDER
@ -142,15 +142,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(order)
+			l_request.set_body(body)
 			l_path := "/store/order"


-			if attached {STRING} api_client.select_header_accept (<<"application/xml", "application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/xml", "application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
--- a/samples/client/petstore/eiffel/src/api/user_api.e
+++ b/samples/client/petstore/eiffel/src/api/user_api.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -24,11 +24,11 @@ inherit
 feature -- API Access


-	create_user (user: USER)
+	create_user (body: USER)
 			-- Create user
 			-- This can only be done by the logged in user.
 			-- 
-			-- argument: user Created user object (required)
+			-- argument: body Created user object (required)
 			-- 
 			-- 
 		require
@ -39,26 +39,26 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(user)
+			l_request.set_body(body)
 			l_path := "/user"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			end
 		end	

-	create_users_with_array_input (user: LIST [USER])
+	create_users_with_array_input (body: LIST [USER])
 			-- Creates list of users with given input array
 			-- 
 			-- 
-			-- argument: user List of user object (required)
+			-- argument: body List of user object (required)
 			-- 
 			-- 
 		require
@ -69,26 +69,26 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(user)
+			l_request.set_body(body)
 			l_path := "/user/createWithArray"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			end
 		end	

-	create_users_with_list_input (user: LIST [USER])
+	create_users_with_list_input (body: LIST [USER])
 			-- Creates list of users with given input array
 			-- 
 			-- 
-			-- argument: user List of user object (required)
+			-- argument: body List of user object (required)
 			-- 
 			-- 
 		require
@ -99,15 +99,15 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(user)
+			l_request.set_body(body)
 			l_path := "/user/createWithList"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Post", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -134,11 +134,11 @@ feature -- API Access
 			l_path.replace_substring_all ("{"+"username"+"}", api_client.url_encode (username.out))


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Delete", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -169,11 +169,11 @@ feature -- API Access
 			l_request.fill_query_params(api_client.parameter_to_tuple("", "password", password));


-			if attached {STRING} api_client.select_header_accept (<<"application/xml", "application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/xml", "application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Get", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
@ -201,24 +201,24 @@ feature -- API Access
 			l_path := "/user/logout"


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Get", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
 			end
 		end	

-	update_user (username: STRING_32; user: USER)
+	update_user (username: STRING_32; body: USER)
 			-- Updated user
 			-- This can only be done by the logged in user.
 			-- 
 			-- argument: username name that need to be deleted (required)
 			-- 
-			-- argument: user Updated user object (required)
+			-- argument: body Updated user object (required)
 			-- 
 			-- 
 		require
@ -229,16 +229,16 @@ feature -- API Access
 		do
 			reset_error
 			create l_request
-			l_request.set_body(user)
+			l_request.set_body(body)
 			l_path := "/user/{username}"
 			l_path.replace_substring_all ("{"+"username"+"}", api_client.url_encode (username.out))


-			if attached {STRING} api_client.select_header_accept (<<>>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<>>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Put", l_request, agent serializer, Void)
 			if l_response.has_error then
 				last_error := l_response.error
@ -266,11 +266,11 @@ feature -- API Access
 			l_path.replace_substring_all ("{"+"username"+"}", api_client.url_encode (username.out))


-			if attached {STRING} api_client.select_header_accept (<<"application/xml", "application/json">>)  as l_accept then
+			if attached {STRING} api_client.select_header_accept ({ARRAY [STRING]}<<"application/xml", "application/json">>)  as l_accept then
 				l_request.add_header(l_accept,"Accept");
 			end
-			l_request.add_header(api_client.select_header_content_type (<<>>),"Content-Type")
-			l_request.set_auth_names (<<>>)
+			l_request.add_header(api_client.select_header_content_type ({ARRAY [STRING]}<<>>),"Content-Type")
+			l_request.set_auth_names ({ARRAY [STRING]}<<>>)
 			l_response := api_client.call_api (l_path, "Get", l_request, Void, agent deserializer)
 			if l_response.has_error then
 				last_error := l_response.error
--- a/samples/client/petstore/eiffel/src/api_client.e
+++ b/samples/client/petstore/eiffel/src/api_client.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -248,7 +248,8 @@ feature -- Query Parameter Helpers
 						-- dateTime	string	date-time	As defined by date-time - RFC3339
 					Result := date_time.date.debug_output
 				elseif attached {STRING_32} a_param as str_32 then
-					Result := str_32
+						-- TODO check if this is a good convertion.
+					Result := str_32.to_string_8
 				elseif attached {STRING_8} a_param as str_8 then
 					Result := str_8
 				else
@ -435,18 +436,18 @@ feature -- HTTP client: call api
 			end
 		end

-	add_header_params (a_content_executor:HTTP_CLIENT_REQUEST_CONTEXT; a_header_params: STRING_TABLE [STRING])
+	add_header_params (a_content_executor:HTTP_CLIENT_REQUEST_CONTEXT; a_header_params: STRING_TABLE [READABLE_STRING_8])
 			-- Set header parameters `a_header_params' to the request context executor `a_content_executor', including default headers.
 		do
 				-- headers
 			across a_header_params as ic  loop
-				a_content_executor.add_header (ic.key.as_string_8, ic.item)
+				a_content_executor.add_header (ic.key.to_string_8, ic.item)
 			end

 				-- default headers
 			across default_header_map as ic  loop
 				if not a_header_params.has (ic.key) then
-					a_content_executor.add_header (ic.key.as_string_8, ic.item)
+					a_content_executor.add_header (ic.key.to_string_8, ic.item)
 				end
 			end
 		end
@ -499,7 +500,7 @@ feature -- HTTP client: Change Element

 feature {NONE} -- Implementation

-	default_header_map: STRING_TABLE [STRING]
+	default_header_map: STRING_TABLE [READABLE_STRING_8]
 			-- default header map.

 	http_session: detachable HTTP_CLIENT_SESSION
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_any_type.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_any_type.e
@ -0,0 +1,54 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class ADDITIONAL_PROPERTIES_ANY_TYPE 
+
+inherit
+
+
+  STRING_TABLE [ANY]
+
+feature --Access
+
+    name: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_)
+        Result.append("%Nclass ADDITIONAL_PROPERTIES_ANY_TYPE%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_array.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_array.e
@ -0,0 +1,54 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class ADDITIONAL_PROPERTIES_ARRAY 
+
+inherit
+
+
+  STRING_TABLE [LIST [ANY]]
+
+feature --Access
+
+    name: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_)
+        Result.append("%Nclass ADDITIONAL_PROPERTIES_ARRAY%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_boolean.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_boolean.e
@ -0,0 +1,54 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class ADDITIONAL_PROPERTIES_BOOLEAN 
+
+inherit
+
+
+  STRING_TABLE [BOOLEAN]
+
+feature --Access
+
+    name: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_)
+        Result.append("%Nclass ADDITIONAL_PROPERTIES_BOOLEAN%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_class.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_class.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,50 +14,135 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ADDITIONAL_PROPERTIES_CLASS 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    map_property: detachable STRING_TABLE[STRING_32] 
+    map_string: detachable STRING_TABLE [STRING_32] 
      
-    map_of_map_property: detachable STRING_TABLE[STRING_TABLE[STRING_32]] 
+ 	map_number: detachable STRING_TABLE [REAL_32] 
+    	 
+ 	map_integer: detachable STRING_TABLE [INTEGER_32] 
+    	 
+ 	map_boolean: detachable STRING_TABLE [BOOLEAN] 
+    	 
+    map_array_integer: detachable STRING_TABLE [LIST [INTEGER_32]] 
+      
+    map_array_anytype: detachable STRING_TABLE [LIST [ANY]] 
+      
+    map_map_string: detachable STRING_TABLE [STRING_TABLE [STRING_32]] 
+      
+    map_map_anytype: detachable STRING_TABLE [STRING_TABLE [ANY]] 
+      
+    anytype_1: detachable ANY 
+      
+    anytype_2: detachable ANY 
+      
+    anytype_3: detachable ANY 
      

 feature -- Change Element  
 
-    set_map_property (a_name: like map_property)
-        -- Set 'map_property' with 'a_name'.
+    set_map_string (a_name: like map_string)
+        -- Set 'map_string' with 'a_name'.
      do
-        map_property := a_name
+        map_string := a_name
      ensure
-        map_property_set: map_property = a_name		
+        map_string_set: map_string = a_name		
      end

-    set_map_of_map_property (a_name: like map_of_map_property)
-        -- Set 'map_of_map_property' with 'a_name'.
+    set_map_number (a_name: like map_number)
+        -- Set 'map_number' with 'a_name'.
      do
-        map_of_map_property := a_name
+        map_number := a_name
      ensure
-        map_of_map_property_set: map_of_map_property = a_name		
+        map_number_set: map_number = a_name		
+      end
+
+    set_map_integer (a_name: like map_integer)
+        -- Set 'map_integer' with 'a_name'.
+      do
+        map_integer := a_name
+      ensure
+        map_integer_set: map_integer = a_name		
+      end
+
+    set_map_boolean (a_name: like map_boolean)
+        -- Set 'map_boolean' with 'a_name'.
+      do
+        map_boolean := a_name
+      ensure
+        map_boolean_set: map_boolean = a_name		
+      end
+
+    set_map_array_integer (a_name: like map_array_integer)
+        -- Set 'map_array_integer' with 'a_name'.
+      do
+        map_array_integer := a_name
+      ensure
+        map_array_integer_set: map_array_integer = a_name		
+      end
+
+    set_map_array_anytype (a_name: like map_array_anytype)
+        -- Set 'map_array_anytype' with 'a_name'.
+      do
+        map_array_anytype := a_name
+      ensure
+        map_array_anytype_set: map_array_anytype = a_name		
+      end
+
+    set_map_map_string (a_name: like map_map_string)
+        -- Set 'map_map_string' with 'a_name'.
+      do
+        map_map_string := a_name
+      ensure
+        map_map_string_set: map_map_string = a_name		
+      end
+
+    set_map_map_anytype (a_name: like map_map_anytype)
+        -- Set 'map_map_anytype' with 'a_name'.
+      do
+        map_map_anytype := a_name
+      ensure
+        map_map_anytype_set: map_map_anytype = a_name		
+      end
+
+    set_anytype_1 (a_name: like anytype_1)
+        -- Set 'anytype_1' with 'a_name'.
+      do
+        anytype_1 := a_name
+      ensure
+        anytype_1_set: anytype_1 = a_name		
+      end
+
+    set_anytype_2 (a_name: like anytype_2)
+        -- Set 'anytype_2' with 'a_name'.
+      do
+        anytype_2 := a_name
+      ensure
+        anytype_2_set: anytype_2 = a_name		
+      end
+
+    set_anytype_3 (a_name: like anytype_3)
+        -- Set 'anytype_3' with 'a_name'.
+      do
+        anytype_3 := a_name
+      ensure
+        anytype_3_set: anytype_3 = a_name		
      end


 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
        Result.append("%Nclass ADDITIONAL_PROPERTIES_CLASS%N")
-        if attached map_property as l_map_property then
-          Result.append ("%Nmap_property:")
-          across l_map_property as ic loop
+        if attached map_string as l_map_string then
+          Result.append ("%Nmap_string:")
+          across l_map_string as ic loop
            Result.append ("%N")
            Result.append ("key:")
            Result.append (ic.key.out)
@ -67,9 +152,9 @@ feature -- Change Element
            Result.append ("%N")
          end
        end        
-        if attached map_of_map_property as l_map_of_map_property then
-          Result.append ("%Nmap_of_map_property:")
-          across l_map_of_map_property as ic loop
+        if attached map_number as l_map_number then
+          Result.append ("%Nmap_number:")
+          across l_map_number as ic loop
            Result.append ("%N")
            Result.append ("key:")
            Result.append (ic.key.out)
@ -79,6 +164,93 @@ feature -- Change Element
            Result.append ("%N")
          end
        end        
+        if attached map_integer as l_map_integer then
+          Result.append ("%Nmap_integer:")
+          across l_map_integer as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
+        if attached map_boolean as l_map_boolean then
+          Result.append ("%Nmap_boolean:")
+          across l_map_boolean as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
+        if attached map_array_integer as l_map_array_integer then
+          Result.append ("%Nmap_array_integer:")
+          across l_map_array_integer as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
+        if attached map_array_anytype as l_map_array_anytype then
+          Result.append ("%Nmap_array_anytype:")
+          across l_map_array_anytype as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
+        if attached map_map_string as l_map_map_string then
+          Result.append ("%Nmap_map_string:")
+          across l_map_map_string as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
+        if attached map_map_anytype as l_map_map_anytype then
+          Result.append ("%Nmap_map_anytype:")
+          across l_map_map_anytype as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
+        if attached anytype_1 as l_anytype_1 then
+          Result.append ("%Nanytype_1:")
+          Result.append (l_anytype_1.out)
+          Result.append ("%N")    
+        end  
+        if attached anytype_2 as l_anytype_2 then
+          Result.append ("%Nanytype_2:")
+          Result.append (l_anytype_2.out)
+          Result.append ("%N")    
+        end  
+        if attached anytype_3 as l_anytype_3 then
+          Result.append ("%Nanytype_3:")
+          Result.append (l_anytype_3.out)
+          Result.append ("%N")    
+        end  
      end
 end

--- a/samples/client/petstore/eiffel/src/domain/additional_properties_integer.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_integer.e
@ -0,0 +1,54 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class ADDITIONAL_PROPERTIES_INTEGER 
+
+inherit
+
+
+  STRING_TABLE [INTEGER_32]
+
+feature --Access
+
+    name: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_)
+        Result.append("%Nclass ADDITIONAL_PROPERTIES_INTEGER%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_number.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_number.e
@ -0,0 +1,54 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class ADDITIONAL_PROPERTIES_NUMBER 
+
+inherit
+
+
+  STRING_TABLE [REAL_32]
+
+feature --Access
+
+    name: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_)
+        Result.append("%Nclass ADDITIONAL_PROPERTIES_NUMBER%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_object.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_object.e
@ -0,0 +1,54 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class ADDITIONAL_PROPERTIES_OBJECT 
+
+inherit
+
+
+  STRING_TABLE [STRING_TABLE [ANY]]
+
+feature --Access
+
+    name: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_)
+        Result.append("%Nclass ADDITIONAL_PROPERTIES_OBJECT%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/additional_properties_string.e
+++ b/samples/client/petstore/eiffel/src/domain/additional_properties_string.e
@ -0,0 +1,54 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class ADDITIONAL_PROPERTIES_STRING 
+
+inherit
+
+
+  STRING_TABLE [STRING_32]
+
+feature --Access
+
+    name: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_)
+        Result.append("%Nclass ADDITIONAL_PROPERTIES_STRING%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/animal.e
+++ b/samples/client/petstore/eiffel/src/domain/animal.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ANIMAL 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -50,7 +45,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/api_response.e
+++ b/samples/client/petstore/eiffel/src/domain/api_response.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,18 +14,13 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class API_RESPONSE 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    code: INTEGER_32 
-      
+ 	code: INTEGER_32 
+    	 
    type: detachable STRING_32 
      
    message: detachable STRING_32 
@ -60,7 +55,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- 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
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ARRAY_OF_ARRAY_OF_NUMBER_ONLY 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -40,7 +35,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/array_of_number_only.e
+++ b/samples/client/petstore/eiffel/src/domain/array_of_number_only.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,18 +14,13 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ARRAY_OF_NUMBER_ONLY 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    array_number: LIST [REAL_32] 
-      
+ 	array_number: detachable LIST [REAL_32] 
+    	 

 feature -- Change Element  
 
@ -40,7 +35,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/array_test.e
+++ b/samples/client/petstore/eiffel/src/domain/array_test.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ARRAY_TEST 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -60,7 +55,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/big_cat.e
+++ b/samples/client/petstore/eiffel/src/domain/big_cat.e
@ -0,0 +1,57 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class BIG_CAT 
+
+inherit
+
+
+  CAT
+      rename
+          output as out_cat     
+      end
+
+feature --Access
+
+    kind: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_kind (a_name: like kind)
+        -- Set 'kind' with 'a_name'.
+      do
+        kind := a_name
+      ensure
+        kind_set: kind = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append(out_cat)
+        Result.append("%Nclass BIG_CAT%N")
+        if attached kind as l_kind then
+          Result.append ("%Nkind:")
+          Result.append (l_kind.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/big_cat_all_of.e
+++ b/samples/client/petstore/eiffel/src/domain/big_cat_all_of.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -12,41 +12,39 @@ note
 	date: "$Date$"
 	revision: "$Revision$"
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
-class ANIMAL_FARM 
+class BIG_CAT_ALL_OF 

-inherit

-  ANY
-      redefine
-          out 
-      select
-          out  
-      end

-  ARRAYED_LIST [ANIMAL] 
-      rename
-          out as out_,
-          is_equal as is_equal_,
-          copy as copy_
-      select
-          is_equal_,
-          copy_     
-      end   

 feature --Access

+    kind: detachable STRING_32 
+      

 feature -- Change Element  
 
+    set_kind (a_name: like kind)
+        -- Set 'kind' with 'a_name'.
+      do
+        kind := a_name
+      ensure
+        kind_set: kind = a_name		
+      end
+

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
-        Result.append(out_)
-        Result.append("%Nclass ANIMAL_FARM%N")
+        Result.append("%Nclass BIG_CAT_ALL_OF%N")
+        if attached kind as l_kind then
+          Result.append ("%Nkind:")
+          Result.append (l_kind.out)
+          Result.append ("%N")    
+        end  
      end
 end

--- a/samples/client/petstore/eiffel/src/domain/capitalization.e
+++ b/samples/client/petstore/eiffel/src/domain/capitalization.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CAPITALIZATION 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -90,7 +85,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/cat.e
+++ b/samples/client/petstore/eiffel/src/domain/cat.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -16,27 +16,16 @@ class CAT

 inherit

-  ANY
-      redefine
-          out 
-      select
-          out  
-      end

-  ANIMAL 
+  ANIMAL
      rename
-          out as out_animal,
-          is_equal as is_equal_animal,
-          copy as copy_animal
-      select
-          is_equal_animal,
-          copy_animal     
-      end   
+          output as out_animal     
+      end

 feature --Access

-    declawed: BOOLEAN 
-      
+ 	declawed: BOOLEAN 
+    	 

 feature -- Change Element  
 
@ -51,7 +40,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/cat_all_of.e
+++ b/samples/client/petstore/eiffel/src/domain/cat_all_of.e
@ -0,0 +1,51 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class CAT_ALL_OF 
+
+
+
+
+feature --Access
+
+ 	declawed: BOOLEAN 
+    	 
+
+feature -- Change Element  
+ 
+    set_declawed (a_name: like declawed)
+        -- Set 'declawed' with 'a_name'.
+      do
+        declawed := a_name
+      ensure
+        declawed_set: declawed = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append("%Nclass CAT_ALL_OF%N")
+        if attached declawed as l_declawed then
+          Result.append ("%Ndeclawed:")
+          Result.append (l_declawed.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/category.e
+++ b/samples/client/petstore/eiffel/src/domain/category.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,18 +14,13 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CATEGORY 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    id: INTEGER_64 
-      
+ 	id: INTEGER_64 
+    	 
    name: detachable STRING_32 
      

@ -50,7 +45,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/class_model.e
+++ b/samples/client/petstore/eiffel/src/domain/class_model.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CLASS_MODEL 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -40,7 +35,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/client.e
+++ b/samples/client/petstore/eiffel/src/domain/client.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class CLIENT 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -40,7 +35,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/dog.e
+++ b/samples/client/petstore/eiffel/src/domain/dog.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -16,22 +16,11 @@ class DOG

 inherit

-  ANY
-      redefine
-          out 
-      select
-          out  
-      end

-  ANIMAL 
+  ANIMAL
      rename
-          out as out_animal,
-          is_equal as is_equal_animal,
-          copy as copy_animal
-      select
-          is_equal_animal,
-          copy_animal     
-      end   
+          output as out_animal     
+      end

 feature --Access

@ -51,7 +40,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/dog_all_of.e
+++ b/samples/client/petstore/eiffel/src/domain/dog_all_of.e
@ -0,0 +1,51 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class DOG_ALL_OF 
+
+
+
+
+feature --Access
+
+    breed: detachable STRING_32 
+      
+
+feature -- Change Element  
+ 
+    set_breed (a_name: like breed)
+        -- Set 'breed' with 'a_name'.
+      do
+        breed := a_name
+      ensure
+        breed_set: breed = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append("%Nclass DOG_ALL_OF%N")
+        if attached breed as l_breed then
+          Result.append ("%Nbreed:")
+          Result.append (l_breed.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/enum_arrays.e
+++ b/samples/client/petstore/eiffel/src/domain/enum_arrays.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ENUM_ARRAYS 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -50,7 +45,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/enum_class.e
+++ b/samples/client/petstore/eiffel/src/domain/enum_class.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/samples/client/petstore/eiffel/src/domain/enum_test.e
+++ b/samples/client/petstore/eiffel/src/domain/enum_test.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ENUM_TEST 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -28,10 +23,10 @@ feature --Access
      
    enum_string_required: detachable STRING_32 
      
-    enum_integer: INTEGER_32 
-      
-    enum_number: REAL_64 
-      
+ 	enum_integer: INTEGER_32 
+    	 
+ 	enum_number: REAL_64 
+    	 
    outer_enum: detachable OUTER_ENUM 
      

@ -80,7 +75,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/file_schema_test_class.e
+++ b/samples/client/petstore/eiffel/src/domain/file_schema_test_class.e
@ -0,0 +1,68 @@
+note
+ description:"[
+		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: \" \\
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class FILE_SCHEMA_TEST_CLASS 
+
+
+
+
+feature --Access
+
+    file: detachable FILE 
+      
+    files: detachable LIST [FILE] 
+      
+
+feature -- Change Element  
+ 
+    set_file (a_name: like file)
+        -- Set 'file' with 'a_name'.
+      do
+        file := a_name
+      ensure
+        file_set: file = a_name		
+      end
+
+    set_files (a_name: like files)
+        -- Set 'files' with 'a_name'.
+      do
+        files := a_name
+      ensure
+        files_set: files = a_name		
+      end
+
+
+ feature -- Status Report
+
+    output: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append("%Nclass FILE_SCHEMA_TEST_CLASS%N")
+        if attached file as l_file then
+          Result.append ("%Nfile:")
+          Result.append (l_file.out)
+          Result.append ("%N")    
+        end  
+        if attached files as l_files then
+          across l_files as ic loop
+            Result.append ("%N files:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end 
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/format_test.e
+++ b/samples/client/petstore/eiffel/src/domain/format_test.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,28 +14,23 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class FORMAT_TEST 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    integer: INTEGER_32 
-      
-    int32: INTEGER_32 
-      
-    int64: INTEGER_64 
-      
-    number: REAL_32 
-      
-    float: REAL_32 
-      
-    double: REAL_64 
-      
+ 	integer: INTEGER_32 
+    	 
+ 	int32: INTEGER_32 
+    	 
+ 	int64: INTEGER_64 
+    	 
+ 	number: REAL_32 
+    	 
+ 	float: REAL_32 
+    	 
+ 	double: REAL_64 
+    	 
    string: detachable STRING_32 
      
    byte: detachable ARRAY [NATURAL_8] 
@ -48,8 +43,10 @@ feature --Access
      
    uuid: detachable UUID 
      
-    password: detachable STRING_32 
+    password: detachable STRING 
      
+ 	big_decimal: REAL_64 
+    	 

 feature -- Change Element  
 
@ -157,10 +154,18 @@ feature -- Change Element
        password_set: password = a_name		
      end

+    set_big_decimal (a_name: like big_decimal)
+        -- Set 'big_decimal' with 'a_name'.
+      do
+        big_decimal := a_name
+      ensure
+        big_decimal_set: big_decimal = a_name		
+      end
+

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
@ -230,6 +235,11 @@ feature -- Change Element
          Result.append (l_password.out)
          Result.append ("%N")    
        end  
+        if attached big_decimal as l_big_decimal then
+          Result.append ("%Nbig_decimal:")
+          Result.append (l_big_decimal.out)
+          Result.append ("%N")    
+        end  
      end
 end

--- a/samples/client/petstore/eiffel/src/domain/has_only_read_only.e
+++ b/samples/client/petstore/eiffel/src/domain/has_only_read_only.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class HAS_ONLY_READ_ONLY 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -50,7 +45,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/inline_object.e
+++ b/samples/client/petstore/eiffel/src/domain/inline_object.e
@ -0,0 +1,71 @@
+note
+ description:"[
+		OpenAPI Petstore
+ 		This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class INLINE_OBJECT 
+
+inherit
+
+  ANY
+      redefine
+          out 
+      end
+
+
+feature --Access
+
+    name: detachable STRING_32 
+      -- Updated name of the pet
+    status: detachable STRING_32 
+      -- Updated status of the pet
+
+feature -- Change Element  
+ 
+    set_name (a_name: like name)
+        -- Set 'name' with 'a_name'.
+      do
+        name := a_name
+      ensure
+        name_set: name = a_name		
+      end
+
+    set_status (a_name: like status)
+        -- Set 'status' with 'a_name'.
+      do
+        status := a_name
+      ensure
+        status_set: status = a_name		
+      end
+
+
+ feature -- Status Report
+
+    out: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append("%Nclass INLINE_OBJECT%N")
+        if attached name as l_name then
+          Result.append ("%Nname:")
+          Result.append (l_name.out)
+          Result.append ("%N")    
+        end  
+        if attached status as l_status then
+          Result.append ("%Nstatus:")
+          Result.append (l_status.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/inline_object_1.e
+++ b/samples/client/petstore/eiffel/src/domain/inline_object_1.e
@ -0,0 +1,71 @@
+note
+ description:"[
+		OpenAPI Petstore
+ 		This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+  		The version of the OpenAPI document: 1.0.0
+ 	    
+
+  	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 openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
+class INLINE_OBJECT_1 
+
+inherit
+
+  ANY
+      redefine
+          out 
+      end
+
+
+feature --Access
+
+    additional_metadata: detachable STRING_32 
+      -- Additional data to pass to server
+    file: detachable FILE 
+      -- file to upload
+
+feature -- Change Element  
+ 
+    set_additional_metadata (a_name: like additional_metadata)
+        -- Set 'additional_metadata' with 'a_name'.
+      do
+        additional_metadata := a_name
+      ensure
+        additional_metadata_set: additional_metadata = a_name		
+      end
+
+    set_file (a_name: like file)
+        -- Set 'file' with 'a_name'.
+      do
+        file := a_name
+      ensure
+        file_set: file = a_name		
+      end
+
+
+ feature -- Status Report
+
+    out: STRING
+          -- <Precursor>
+      do
+        create Result.make_empty
+        Result.append("%Nclass INLINE_OBJECT_1%N")
+        if attached additional_metadata as l_additional_metadata then
+          Result.append ("%Nadditional_metadata:")
+          Result.append (l_additional_metadata.out)
+          Result.append ("%N")    
+        end  
+        if attached file as l_file then
+          Result.append ("%Nfile:")
+          Result.append (l_file.out)
+          Result.append ("%N")    
+        end  
+      end
+end
+
+
--- a/samples/client/petstore/eiffel/src/domain/map_test.e
+++ b/samples/client/petstore/eiffel/src/domain/map_test.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,20 +14,19 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class MAP_TEST 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    map_map_of_string: detachable STRING_TABLE[STRING_TABLE[STRING_32]] 
+    map_map_of_string: detachable STRING_TABLE [STRING_TABLE [STRING_32]] 
      
-    map_of_enum_string: detachable STRING_TABLE[STRING_32] 
+    map_of_enum_string: detachable STRING_TABLE [STRING_32] 
      
+ 	direct_map: detachable STRING_TABLE [BOOLEAN] 
+    	 
+ 	indirect_map: detachable STRING_TABLE [BOOLEAN] 
+    	 

 feature -- Change Element  
 
@ -47,10 +46,26 @@ feature -- Change Element
        map_of_enum_string_set: map_of_enum_string = a_name		
      end

+    set_direct_map (a_name: like direct_map)
+        -- Set 'direct_map' with 'a_name'.
+      do
+        direct_map := a_name
+      ensure
+        direct_map_set: direct_map = a_name		
+      end
+
+    set_indirect_map (a_name: like indirect_map)
+        -- Set 'indirect_map' with 'a_name'.
+      do
+        indirect_map := a_name
+      ensure
+        indirect_map_set: indirect_map = a_name		
+      end
+

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
@ -79,6 +94,30 @@ feature -- Change Element
            Result.append ("%N")
          end
        end        
+        if attached direct_map as l_direct_map then
+          Result.append ("%Ndirect_map:")
+          across l_direct_map as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
+        if attached indirect_map as l_indirect_map then
+          Result.append ("%Nindirect_map:")
+          across l_indirect_map as ic loop
+            Result.append ("%N")
+            Result.append ("key:")
+            Result.append (ic.key.out)
+            Result.append (" - ")
+            Result.append ("val:")
+            Result.append (ic.item.out)
+            Result.append ("%N")
+          end
+        end        
      end
 end

--- 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
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,12 +14,7 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class MIXED_PROPERTIES_AND_ADDITIONAL_PROPERTIES_CLASS 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access
@ -28,7 +23,7 @@ feature --Access
      
    date_time: detachable DATE_TIME 
      
-    map: detachable STRING_TABLE[ANIMAL] 
+    map: detachable STRING_TABLE [ANIMAL] 
      

 feature -- Change Element  
@ -60,7 +55,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/model_200_response.e
+++ b/samples/client/petstore/eiffel/src/domain/model_200_response.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,18 +14,13 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class MODEL_200_RESPONSE 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    name: INTEGER_32 
-      
+ 	name: INTEGER_32 
+    	 
    var_class: detachable STRING_32 
      

@ -50,7 +45,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/name.e
+++ b/samples/client/petstore/eiffel/src/domain/name.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,24 +14,19 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class NAME 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    name: INTEGER_32 
-      
-    snake_case: INTEGER_32 
-      
+ 	name: INTEGER_32 
+    	 
+ 	snake_case: INTEGER_32 
+    	 
    property: detachable STRING_32 
      
-    var_123_number: INTEGER_32 
-      
+ 	var_123_number: INTEGER_32 
+    	 

 feature -- Change Element  
 
@ -70,7 +65,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/number_only.e
+++ b/samples/client/petstore/eiffel/src/domain/number_only.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,18 +14,13 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class NUMBER_ONLY 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    just_number: REAL_32 
-      
+ 	just_number: REAL_32 
+    	 

 feature -- Change Element  
 
@ -40,7 +35,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/order.e
+++ b/samples/client/petstore/eiffel/src/domain/order.e
@ -2,7 +2,7 @@ note
 description:"[
 		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
+  		The version of the OpenAPI document: 1.0.0
 	    

  	NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@ -14,28 +14,23 @@ note
 	EIS:"Eiffel openapi generator", "src=https://openapi-generator.tech", "protocol=uri"
 class ORDER 

-inherit

-  ANY
-      redefine
-          out 
-      end


 feature --Access

-    id: INTEGER_64 
-      
-    pet_id: INTEGER_64 
-      
-    quantity: INTEGER_32 
-      
+ 	id: INTEGER_64 
+    	 
+ 	pet_id: INTEGER_64 
+    	 
+ 	quantity: INTEGER_32 
+    	 
    ship_date: detachable DATE_TIME 
      
    status: detachable STRING_32 
      -- Order Status
-    complete: BOOLEAN 
-      
+ 	complete: BOOLEAN 
+    	 

 feature -- Change Element  
 
@ -90,7 +85,7 @@ feature -- Change Element

 feature -- Status Report

-    out: STRING
+    output: STRING
          -- <Precursor>
      do
        create Result.make_empty
--- a/samples/client/petstore/eiffel/src/domain/outer_boolean.e
+++ b/samples/client/petstore/eiffel/src/domain/outer_boolean.e
@ -1,40 +0,0 @@
-note
- description:"[
-		Swagger 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.
-
- 		 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"
-
-class OUTER_BOOLEAN 
-
-inherit
-
-  ANY
-      redefine
-          out 
-      end
-
-
-feature --Access
-
-
-feature -- Change Element  
- 
-
- feature -- Status Report
-
-    out: STRING
-          -- <Precursor>
-      do
-        create Result.make_empty
-        Result.append("%Nclass OUTER_BOOLEAN%N")
-      end
-end
--- a/Show More
+++ b/Show More