[bash] Update Bash Client Dockerfile.mustache (#9310)

* Update Dockerfile.mustache Using alpine instead of ubuntu for leaner Docker images. Small fix for welcome message. Changing default shell to `zsh` and fixing entrypoint. * update samples * move config, add new files Co-authored-by: avbenavides <62693723+avbenavides@users.noreply.github.com>
2021-04-22 15:02:38 +08:00 · 2021-04-22 15:02:38 +08:00 · 946d145d30
commit 946d145d30
parent d7736366b7
23 changed files with 357 additions and 332 deletions
--- a/bin/configs/other/bash.yaml
+++ b/bin/configs/other/bash.yaml
--- a/modules/openapi-generator/src/main/resources/bash/Dockerfile.mustache
+++ b/modules/openapi-generator/src/main/resources/bash/Dockerfile.mustache
@ -1,7 +1,6 @@
-FROM ubuntu:16.10
+FROM alpine:3.12.0

-RUN apt-get update -y && apt-get full-upgrade -y
-RUN apt-get install -y bash-completion zsh curl cowsay git vim bsdmainutils
+RUN apk add --update --no-cache curl ca-certificates bash bash-completion zsh curl git vim ncurses util-linux

 ADD {{scriptName}} /usr/bin/{{scriptName}}
 ADD _{{scriptName}} /usr/local/share/zsh/site-functions/_{{scriptName}}
@ -30,7 +29,7 @@ RUN echo 'export PROMPT="[{{appName}}] \$ "' >> ~/.zshrc
 #
 # Setup a welcome message with basic instruction
 #
-RUN echo 'cat << EOF\n\
+RUN echo -e 'echo "\
 \n\
 This Docker provides preconfigured environment for running the command\n\
 line REST client for $(tput setaf 6){{appName}}$(tput sgr0).\n\
@ -63,7 +62,14 @@ $ {{scriptName}} <operationId> -h\n\
 By default you are logged into Zsh with full autocompletion for your REST API,\n\
 but you can switch to Bash, where basic autocompletion is also supported.\n\
 \n\
-EOF\n\
+"\
 ' | tee -a ~/.bashrc ~/.zshrc

-ENTRYPOINT ["zsh"]
+#
+# Poormans chsh & cleanup to make image as compact as possible
+#
+
+RUN sed -i 's/root:x:0:0:root:\/root:\/bin\/ash/root:x:0:0:root:\/root:\/bin\/zsh/' /etc/passwd
+RUN apk del git vim && rm -f /var/cache/apk/*
+
+ENTRYPOINT ["/bin/zsh"]
--- a/samples/client/petstore/bash/.openapi-generator/FILES
+++ b/samples/client/petstore/bash/.openapi-generator/FILES
@ -0,0 +1,59 @@
+Dockerfile
+README.md
+_petstore-cli
+docs/$special[modelName].md
+docs/200Response.md
+docs/AdditionalPropertiesAnyType.md
+docs/AdditionalPropertiesArray.md
+docs/AdditionalPropertiesBoolean.md
+docs/AdditionalPropertiesClass.md
+docs/AdditionalPropertiesInteger.md
+docs/AdditionalPropertiesNumber.md
+docs/AdditionalPropertiesObject.md
+docs/AdditionalPropertiesString.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/BigCat.md
+docs/BigCatAllOf.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Client.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/File.md
+docs/FileSchemaTestClass.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Name.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/StoreApi.md
+docs/Tag.md
+docs/TypeHolderDefault.md
+docs/TypeHolderExample.md
+docs/User.md
+docs/UserApi.md
+docs/XmlItem.md
+petstore-cli
+petstore-cli.bash-completion
--- a/samples/client/petstore/bash/.openapi-generator/VERSION
+++ b/samples/client/petstore/bash/.openapi-generator/VERSION
@ -1 +1 @@
-4.2.2-SNAPSHOT
+5.1.1-SNAPSHOT
--- a/samples/client/petstore/bash/Dockerfile
+++ b/samples/client/petstore/bash/Dockerfile
@ -1,7 +1,6 @@
-FROM ubuntu:16.10
+FROM alpine:3.12.0

-RUN apt-get update -y && apt-get full-upgrade -y
-RUN apt-get install -y bash-completion zsh curl cowsay git vim bsdmainutils
+RUN apk add --update --no-cache curl ca-certificates bash bash-completion zsh curl git vim ncurses util-linux

 ADD petstore-cli /usr/bin/petstore-cli
 ADD _petstore-cli /usr/local/share/zsh/site-functions/_petstore-cli
@ -30,7 +29,7 @@ RUN echo 'export PROMPT="[OpenAPI Petstore] \$ "' >> ~/.zshrc
 #
 # Setup a welcome message with basic instruction
 #
-RUN echo 'cat << EOF\n\
+RUN echo -e 'echo "\
 \n\
 This Docker provides preconfigured environment for running the command\n\
 line REST client for $(tput setaf 6)OpenAPI Petstore$(tput sgr0).\n\
@ -41,7 +40,6 @@ $(tput setaf 3)PETSTORE_HOST$(tput sgr0) - server URL, e.g. https://example.com:
 $(tput setaf 3)PETSTORE_API_KEY$(tput sgr0) - access token, e.g. "ASDASHJDG63456asdASSD"\n\
 $(tput setaf 3)PETSTORE_API_KEY$(tput sgr0) - access token, e.g. "ASDASHJDG63456asdASSD"\n\
 $(tput setaf 3)PETSTORE_BASIC_AUTH$(tput sgr0) - basic authentication credentials, e.g.: "username:password"\n\
-$(tput setaf 3)PETSTORE_BASIC_AUTH$(tput sgr0) - basic authentication credentials, e.g.: "username:password"\n\
 \n\
 $(tput setaf 7)Basic usage:$(tput sgr0)\n\
 \n\
@ -57,7 +55,14 @@ $ petstore-cli <operationId> -h\n\
 By default you are logged into Zsh with full autocompletion for your REST API,\n\
 but you can switch to Bash, where basic autocompletion is also supported.\n\
 \n\
-EOF\n\
+"\
 ' | tee -a ~/.bashrc ~/.zshrc

-ENTRYPOINT ["zsh"]
+#
+# Poormans chsh & cleanup to make image as compact as possible
+#
+
+RUN sed -i 's/root:x:0:0:root:\/root:\/bin\/ash/root:x:0:0:root:\/root:\/bin\/zsh/' /etc/passwd
+RUN apk del git vim && rm -f /var/cache/apk/*
+
+ENTRYPOINT ["/bin/zsh"]
--- a/samples/client/petstore/bash/README.md
+++ b/samples/client/petstore/bash/README.md
@ -101,8 +101,7 @@ All URIs are relative to */v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AnotherFakeApi* | [**call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
-*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooget) | **GET** /foo | 
-*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakehealthget) | **GET** /fake/health | Health check endpoint
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
@ -145,13 +144,23 @@ Class | Method | HTTP request | Description

 ## Documentation For Models

+ - [$special[modelName]](docs/$special[modelName].md)
 - [200Response](docs/200Response.md)
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
 - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
 - [Animal](docs/Animal.md)
 - [ApiResponse](docs/ApiResponse.md)
 - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
 - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
 - [ArrayTest](docs/ArrayTest.md)
+ - [BigCat](docs/BigCat.md)
+ - [BigCatAllOf](docs/BigCatAllOf.md)
 - [Capitalization](docs/Capitalization.md)
 - [Cat](docs/Cat.md)
 - [CatAllOf](docs/CatAllOf.md)
@ -163,35 +172,26 @@ Class | Method | HTTP request | Description
 - [EnumArrays](docs/EnumArrays.md)
 - [EnumClass](docs/EnumClass.md)
 - [EnumTest](docs/EnumTest.md)
+ - [File](docs/File.md)
 - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
- - [Foo](docs/Foo.md)
 - [FormatTest](docs/FormatTest.md)
 - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
- - [HealthCheckResult](docs/HealthCheckResult.md)
- - [InlineObject](docs/InlineObject.md)
- - [InlineObject1](docs/InlineObject1.md)
- - [InlineObject2](docs/InlineObject2.md)
- - [InlineObject3](docs/InlineObject3.md)
- - [InlineObject4](docs/InlineObject4.md)
- - [InlineObject5](docs/InlineObject5.md)
- - [InlineResponseDefault](docs/InlineResponseDefault.md)
+ - [List](docs/List.md)
 - [MapTest](docs/MapTest.md)
 - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
 - [Name](docs/Name.md)
- - [NullableClass](docs/NullableClass.md)
 - [NumberOnly](docs/NumberOnly.md)
 - [Order](docs/Order.md)
 - [OuterComposite](docs/OuterComposite.md)
 - [OuterEnum](docs/OuterEnum.md)
- - [OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
- - [OuterEnumInteger](docs/OuterEnumInteger.md)
- - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
 - [Pet](docs/Pet.md)
 - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
 - [Return](docs/Return.md)
- - [SpecialModelName](docs/SpecialModelName.md)
 - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
 - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)


 ## Documentation For Authorization
@ -211,10 +211,6 @@ Class | Method | HTTP request | Description
 - **API key parameter name**: api_key_query
 - **Location**: URL query string

-## bearer_test
-
- **Type**: HTTP basic authentication
-
 ## http_basic_test

 - **Type**: HTTP basic authentication
--- a/samples/client/petstore/bash/_petstore-cli
+++ b/samples/client/petstore/bash/_petstore-cli
@ -296,7 +296,7 @@ case $state in
  ops)
    # Operations
    _values "Operations" \
-            "call123TestSpecialTags[To test special tags]"             "fooGet[]"             "fakeHealthGet[Health check endpoint]" \
+            "call123TestSpecialTags[To test special tags]"             "createXmlItem[creates an XmlItem]" \
            "fakeOuterBooleanSerialize[]" \
            "fakeOuterCompositeSerialize[]" \
            "fakeOuterNumberSerialize[]" \
@ -330,7 +330,8 @@ case $state in
            "getUserByName[Get user by user name]" \
            "loginUser[Logs user into the system]" \
            "logoutUser[Logs out current logged in user session]" \
-            "updateUser[Updated user]" 
+            "updateUser[Updated user]" \
+
    _arguments "(--help)--help[Print information about operation]"

    ret=0
@ -343,13 +344,7 @@ case $state in
                              )
        _describe -t actions 'operations' _op_arguments -S '' && ret=0
        ;;
-      fooGet)
-        local -a _op_arguments
-        _op_arguments=(
-                              )
-        _describe -t actions 'operations' _op_arguments -S '' && ret=0
-        ;;
-      fakeHealthGet)
+      createXmlItem)
        local -a _op_arguments
        _op_arguments=(
                              )
--- a/samples/client/petstore/bash/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/bash/docs/AdditionalPropertiesClass.md
@ -3,8 +3,17 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**mapUnderscoreproperty** | **map[String, string]** |  | [optional] [default to null]
-**mapUnderscoreofUnderscoremapUnderscoreproperty** | **map[String, map[String, string]]** |  | [optional] [default to null]
+**mapUnderscorestring** | **map[String, string]** |  | [optional] [default to null]
+**mapUnderscorenumber** | **map[String, integer]** |  | [optional] [default to null]
+**mapUnderscoreinteger** | **map[String, integer]** |  | [optional] [default to null]
+**mapUnderscoreboolean** | **map[String, boolean]** |  | [optional] [default to null]
+**mapUnderscorearrayUnderscoreinteger** | **map[String, array[integer]]** |  | [optional] [default to null]
+**mapUnderscorearrayUnderscoreanytype** | **map[String, array[map]]** |  | [optional] [default to null]
+**mapUnderscoremapUnderscorestring** | **map[String, map[String, string]]** |  | [optional] [default to null]
+**mapUnderscoremapUnderscoreanytype** | **map[String, map[String, map]]** |  | [optional] [default to null]
+**anytypeUnderscore1** | **map** |  | [optional] [default to null]
+**anytypeUnderscore2** | **map** |  | [optional] [default to null]
+**anytypeUnderscore3** | **map** |  | [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/bash/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/bash/docs/AnotherFakeApi.md
@ -25,7 +25,7 @@ petstore-cli call123TestSpecialTags

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

 ### Return type

--- a/samples/client/petstore/bash/docs/BigCat.md
+++ b/samples/client/petstore/bash/docs/BigCat.md
@ -0,0 +1,13 @@
+# BigCat
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **string** |  | [default to null]
+**color** | **string** |  | [optional] [default to red]
+**declawed** | **boolean** |  | [optional] [default to null]
+**kind** | **string** |  | [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/bash/docs/BigCatAllOf.md
+++ b/samples/client/petstore/bash/docs/BigCatAllOf.md
@ -0,0 +1,10 @@
+# BigCat_allOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**kind** | **string** |  | [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/bash/docs/EnumTest.md
+++ b/samples/client/petstore/bash/docs/EnumTest.md
@ -8,9 +8,6 @@ Name | Type | Description | Notes
 **enumUnderscoreinteger** | **integer** |  | [optional] [default to null]
 **enumUnderscorenumber** | **float** |  | [optional] [default to null]
 **outerEnum** | [**OuterEnum**](OuterEnum.md) |  | [optional] [default to null]
-**outerEnumInteger** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | [optional] [default to null]
-**outerEnumDefaultValue** | [**OuterEnumDefaultValue**](OuterEnumDefaultValue.md) |  | [optional] [default to null]
-**outerEnumIntegerDefaultValue** | [**OuterEnumIntegerDefaultValue**](OuterEnumIntegerDefaultValue.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/bash/docs/FakeApi.md
+++ b/samples/client/petstore/bash/docs/FakeApi.md
@ -4,7 +4,7 @@ All URIs are relative to */v2*

 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
+[**createXmlItem**](FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
 [**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
@ -24,23 +24,28 @@ Method | HTTP request | Description



-## fakeHealthGet
+## createXmlItem

-Health check endpoint
+creates an XmlItem
+
+this route creates an XmlItem

 ### Example

 ```bash
-petstore-cli fakeHealthGet
+petstore-cli createXmlItem
 ```

 ### Parameters

-This endpoint does not need any parameter.
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **xmlItem** | [**XmlItem**](XmlItem.md) | XmlItem Body |

 ### Return type

-[**HealthCheckResult**](HealthCheckResult.md)
+(empty response body)

 ### Authorization

@ -48,8 +53,8 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: Not Applicable
- **Accept**: application/json
+- **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 Applicable

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

@ -83,7 +88,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: */*

 [[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)
@ -106,7 +111,7 @@ petstore-cli fakeOuterCompositeSerialize

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

 ### Return type

@ -118,7 +123,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: */*

 [[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)
@ -153,7 +158,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: */*

 [[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)
@ -188,7 +193,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: */*

 [[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)
@ -211,7 +216,7 @@ petstore-cli testBodyWithFileSchema

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **fileSchemaTestClass** | [**FileSchemaTestClass**](FileSchemaTestClass.md) |  |
+ **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md) |  |

 ### Return type

@ -245,7 +250,7 @@ petstore-cli testBodyWithQueryParams  query=value
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **query** | **string** |  | [default to null]
- **user** | [**User**](User.md) |  |
+ **body** | [**User**](User.md) |  |

 ### Return type

@ -280,7 +285,7 @@ petstore-cli testClientModel

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

 ### Return type

@ -361,7 +366,7 @@ To test enum parameters
 ### Example

 ```bash
-petstore-cli testEnumParameters enum_header_string_array:value enum_header_string:value  Specify as:  enum_query_string_array=value1 enum_query_string_array=value2 enum_query_string_array=...  enum_query_string=value  enum_query_integer=value  enum_query_double=value
+petstore-cli testEnumParameters enum_header_string_array:value enum_header_string:value  Specify as:  enum_query_string_array="value1,value2,..."  enum_query_string=value  enum_query_integer=value  enum_query_double=value
 ```

 ### Parameters
@ -424,7 +429,7 @@ Name | Type | Description  | Notes

 ### Authorization

-[bearer_test](../README.md#bearer_test)
+No authorization required

 ### HTTP request headers

@ -449,7 +454,7 @@ petstore-cli testInlineAdditionalProperties

 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **requestBody** | [**map[String, string]**](string.md) | request body |
+ **param** | [**map[String, string]**](string.md) | request body |

 ### Return type

@ -510,7 +515,7 @@ To test the collection format in query parameters
 ### Example

 ```bash
-petstore-cli testQueryParameterCollectionFormat  Specify as:  pipe=value1 pipe=value2 pipe=...  Specify as:  ioutil="value1,value2,..."  Specify as:   Specify as:  url="value1,value2,..."  Specify as:  context=value1 context=value2 context=...
+petstore-cli testQueryParameterCollectionFormat  Specify as:  pipe="value1,value2,..."  Specify as:  ioutil="value1,value2,..."  Specify as:  http="value1 value2 ..."  Specify as:  url="value1,value2,..."  Specify as:  context=value1 context=value2 context=...
 ```

 ### Parameters
--- a/samples/client/petstore/bash/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/bash/docs/FakeClassnameTags123Api.md
@ -25,7 +25,7 @@ petstore-cli testClassname

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

 ### Return type

--- a/samples/client/petstore/bash/docs/File.md
+++ b/samples/client/petstore/bash/docs/File.md
@ -0,0 +1,10 @@
+# File
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**sourceURI** | **string** |  | [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/bash/docs/FormatTest.md
+++ b/samples/client/petstore/bash/docs/FormatTest.md
@ -16,8 +16,7 @@ Name | Type | Description | Notes
 **dateTime** | **string** |  | [optional] [default to null]
 **uuid** | **string** |  | [optional] [default to null]
 **password** | **string** |  | [default to null]
-**patternUnderscorewithUnderscoredigits** | **string** |  | [optional] [default to null]
-**patternUnderscorewithUnderscoredigitsUnderscoreandUnderscoredelimiter** | **string** |  | [optional] [default to null]
+**BigDecimal** | [**Decimal**](Decimal.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/bash/docs/List.md
+++ b/samples/client/petstore/bash/docs/List.md
@ -0,0 +1,10 @@
+# List
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**123Minuslist** | **string** |  | [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/bash/docs/Pet.md
+++ b/samples/client/petstore/bash/docs/Pet.md
@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **id** | **integer** |  | [optional] [default to null]
 **category** | [**Category**](Category.md) |  | [optional] [default to null]
 **name** | **string** |  | [default to null]
-**photoUrls** | **array[string]** |  | [default to null]
+**photoUrls** | **Set[string]** |  | [default to null]
 **tags** | [**array[Tag]**](Tag.md) |  | [optional] [default to null]
 **status** | **string** |  | [optional] [default to null]

--- a/samples/client/petstore/bash/docs/PetApi.md
+++ b/samples/client/petstore/bash/docs/PetApi.md
@ -31,7 +31,7 @@ petstore-cli addPet

 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

@ -135,11 +135,11 @@ petstore-cli findPetsByTags  Specify as:  tags="value1,value2,..."

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

 ### Return type

-[**array[Pet]**](Pet.md)
+[**Set[Pet]**](Pet.md)

 ### Authorization

@ -203,7 +203,7 @@ petstore-cli updatePet

 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

--- a/samples/client/petstore/bash/docs/StoreApi.md
+++ b/samples/client/petstore/bash/docs/StoreApi.md
@ -128,7 +128,7 @@ petstore-cli placeOrder

 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

@ -140,7 +140,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: application/xml, 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/bash/docs/UserApi.md
+++ b/samples/client/petstore/bash/docs/UserApi.md
@ -32,7 +32,7 @@ petstore-cli createUser

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

 ### Return type

@ -44,7 +44,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: Not Applicable

 [[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)
@ -65,7 +65,7 @@ petstore-cli createUsersWithArrayInput

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

 ### Return type

@ -77,7 +77,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: Not Applicable

 [[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)
@ -98,7 +98,7 @@ petstore-cli createUsersWithListInput

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

 ### Return type

@ -110,7 +110,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: Not Applicable

 [[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)
@ -266,7 +266,7 @@ petstore-cli updateUser username=value
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **username** | **string** | name that need to be deleted | [default to null]
- **user** | [**User**](User.md) | Updated user object |
+ **body** | [**User**](User.md) | Updated user object |

 ### Return type

@ -278,7 +278,7 @@ No authorization required

 ### HTTP request headers

- **Content-Type**: application/json
+- **Content-Type**: Not Applicable
 - **Accept**: Not Applicable

 [[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/bash/petstore-cli
+++ b/samples/client/petstore/bash/petstore-cli
@ -95,15 +95,16 @@ declare -a result_color_table=( "$WHITE" "$WHITE" "$GREEN" "$YELLOW" "$WHITE" "$
 # 0 - optional
 # 1 - required
 declare -A operation_parameters_minimum_occurrences
-operation_parameters_minimum_occurrences["call123TestSpecialTags:::Client"]=1
+operation_parameters_minimum_occurrences["call123TestSpecialTags:::body"]=1
+operation_parameters_minimum_occurrences["createXmlItem:::XmlItem"]=1
 operation_parameters_minimum_occurrences["fakeOuterBooleanSerialize:::body"]=0
-operation_parameters_minimum_occurrences["fakeOuterCompositeSerialize:::OuterComposite"]=0
+operation_parameters_minimum_occurrences["fakeOuterCompositeSerialize:::body"]=0
 operation_parameters_minimum_occurrences["fakeOuterNumberSerialize:::body"]=0
 operation_parameters_minimum_occurrences["fakeOuterStringSerialize:::body"]=0
-operation_parameters_minimum_occurrences["testBodyWithFileSchema:::FileSchemaTestClass"]=1
+operation_parameters_minimum_occurrences["testBodyWithFileSchema:::body"]=1
 operation_parameters_minimum_occurrences["testBodyWithQueryParams:::query"]=1
-operation_parameters_minimum_occurrences["testBodyWithQueryParams:::User"]=1
-operation_parameters_minimum_occurrences["testClientModel:::Client"]=1
+operation_parameters_minimum_occurrences["testBodyWithQueryParams:::body"]=1
+operation_parameters_minimum_occurrences["testClientModel:::body"]=1
 operation_parameters_minimum_occurrences["testEndpointParameters:::number"]=1
 operation_parameters_minimum_occurrences["testEndpointParameters:::double"]=1
 operation_parameters_minimum_occurrences["testEndpointParameters:::pattern_without_delimiter"]=1
@ -132,7 +133,7 @@ operation_parameters_minimum_occurrences["testGroupParameters:::required_int64_g
 operation_parameters_minimum_occurrences["testGroupParameters:::string_group"]=0
 operation_parameters_minimum_occurrences["testGroupParameters:::boolean_group"]=0
 operation_parameters_minimum_occurrences["testGroupParameters:::int64_group"]=0
-operation_parameters_minimum_occurrences["testInlineAdditionalProperties:::request_body"]=1
+operation_parameters_minimum_occurrences["testInlineAdditionalProperties:::param"]=1
 operation_parameters_minimum_occurrences["testJsonFormData:::param"]=1
 operation_parameters_minimum_occurrences["testJsonFormData:::param2"]=1
 operation_parameters_minimum_occurrences["testQueryParameterCollectionFormat:::pipe"]=1
@ -140,14 +141,14 @@ operation_parameters_minimum_occurrences["testQueryParameterCollectionFormat:::i
 operation_parameters_minimum_occurrences["testQueryParameterCollectionFormat:::http"]=1
 operation_parameters_minimum_occurrences["testQueryParameterCollectionFormat:::url"]=1
 operation_parameters_minimum_occurrences["testQueryParameterCollectionFormat:::context"]=1
-operation_parameters_minimum_occurrences["testClassname:::Client"]=1
-operation_parameters_minimum_occurrences["addPet:::Pet"]=1
+operation_parameters_minimum_occurrences["testClassname:::body"]=1
+operation_parameters_minimum_occurrences["addPet:::body"]=1
 operation_parameters_minimum_occurrences["deletePet:::petId"]=1
 operation_parameters_minimum_occurrences["deletePet:::api_key"]=0
 operation_parameters_minimum_occurrences["findPetsByStatus:::status"]=1
 operation_parameters_minimum_occurrences["findPetsByTags:::tags"]=1
 operation_parameters_minimum_occurrences["getPetById:::petId"]=1
-operation_parameters_minimum_occurrences["updatePet:::Pet"]=1
+operation_parameters_minimum_occurrences["updatePet:::body"]=1
 operation_parameters_minimum_occurrences["updatePetWithForm:::petId"]=1
 operation_parameters_minimum_occurrences["updatePetWithForm:::name"]=0
 operation_parameters_minimum_occurrences["updatePetWithForm:::status"]=0
@ -159,16 +160,16 @@ operation_parameters_minimum_occurrences["uploadFileWithRequiredFile:::requiredF
 operation_parameters_minimum_occurrences["uploadFileWithRequiredFile:::additionalMetadata"]=0
 operation_parameters_minimum_occurrences["deleteOrder:::order_id"]=1
 operation_parameters_minimum_occurrences["getOrderById:::order_id"]=1
-operation_parameters_minimum_occurrences["placeOrder:::Order"]=1
-operation_parameters_minimum_occurrences["createUser:::User"]=1
-operation_parameters_minimum_occurrences["createUsersWithArrayInput:::User"]=1
-operation_parameters_minimum_occurrences["createUsersWithListInput:::User"]=1
+operation_parameters_minimum_occurrences["placeOrder:::body"]=1
+operation_parameters_minimum_occurrences["createUser:::body"]=1
+operation_parameters_minimum_occurrences["createUsersWithArrayInput:::body"]=1
+operation_parameters_minimum_occurrences["createUsersWithListInput:::body"]=1
 operation_parameters_minimum_occurrences["deleteUser:::username"]=1
 operation_parameters_minimum_occurrences["getUserByName:::username"]=1
 operation_parameters_minimum_occurrences["loginUser:::username"]=1
 operation_parameters_minimum_occurrences["loginUser:::password"]=1
 operation_parameters_minimum_occurrences["updateUser:::username"]=1
-operation_parameters_minimum_occurrences["updateUser:::User"]=1
+operation_parameters_minimum_occurrences["updateUser:::body"]=1

 ##
 # This array stores the maximum number of allowed occurrences for parameter
@ -177,15 +178,16 @@ operation_parameters_minimum_occurrences["updateUser:::User"]=1
 # N - N values
 # 0 - unlimited
 declare -A operation_parameters_maximum_occurrences
-operation_parameters_maximum_occurrences["call123TestSpecialTags:::Client"]=0
+operation_parameters_maximum_occurrences["call123TestSpecialTags:::body"]=0
+operation_parameters_maximum_occurrences["createXmlItem:::XmlItem"]=0
 operation_parameters_maximum_occurrences["fakeOuterBooleanSerialize:::body"]=0
-operation_parameters_maximum_occurrences["fakeOuterCompositeSerialize:::OuterComposite"]=0
+operation_parameters_maximum_occurrences["fakeOuterCompositeSerialize:::body"]=0
 operation_parameters_maximum_occurrences["fakeOuterNumberSerialize:::body"]=0
 operation_parameters_maximum_occurrences["fakeOuterStringSerialize:::body"]=0
-operation_parameters_maximum_occurrences["testBodyWithFileSchema:::FileSchemaTestClass"]=0
+operation_parameters_maximum_occurrences["testBodyWithFileSchema:::body"]=0
 operation_parameters_maximum_occurrences["testBodyWithQueryParams:::query"]=0
-operation_parameters_maximum_occurrences["testBodyWithQueryParams:::User"]=0
-operation_parameters_maximum_occurrences["testClientModel:::Client"]=0
+operation_parameters_maximum_occurrences["testBodyWithQueryParams:::body"]=0
+operation_parameters_maximum_occurrences["testClientModel:::body"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::number"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::double"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::pattern_without_delimiter"]=0
@ -214,7 +216,7 @@ operation_parameters_maximum_occurrences["testGroupParameters:::required_int64_g
 operation_parameters_maximum_occurrences["testGroupParameters:::string_group"]=0
 operation_parameters_maximum_occurrences["testGroupParameters:::boolean_group"]=0
 operation_parameters_maximum_occurrences["testGroupParameters:::int64_group"]=0
-operation_parameters_maximum_occurrences["testInlineAdditionalProperties:::request_body"]=0
+operation_parameters_maximum_occurrences["testInlineAdditionalProperties:::param"]=0
 operation_parameters_maximum_occurrences["testJsonFormData:::param"]=0
 operation_parameters_maximum_occurrences["testJsonFormData:::param2"]=0
 operation_parameters_maximum_occurrences["testQueryParameterCollectionFormat:::pipe"]=0
@ -222,14 +224,14 @@ operation_parameters_maximum_occurrences["testQueryParameterCollectionFormat:::i
 operation_parameters_maximum_occurrences["testQueryParameterCollectionFormat:::http"]=0
 operation_parameters_maximum_occurrences["testQueryParameterCollectionFormat:::url"]=0
 operation_parameters_maximum_occurrences["testQueryParameterCollectionFormat:::context"]=0
-operation_parameters_maximum_occurrences["testClassname:::Client"]=0
-operation_parameters_maximum_occurrences["addPet:::Pet"]=0
+operation_parameters_maximum_occurrences["testClassname:::body"]=0
+operation_parameters_maximum_occurrences["addPet:::body"]=0
 operation_parameters_maximum_occurrences["deletePet:::petId"]=0
 operation_parameters_maximum_occurrences["deletePet:::api_key"]=0
 operation_parameters_maximum_occurrences["findPetsByStatus:::status"]=0
 operation_parameters_maximum_occurrences["findPetsByTags:::tags"]=0
 operation_parameters_maximum_occurrences["getPetById:::petId"]=0
-operation_parameters_maximum_occurrences["updatePet:::Pet"]=0
+operation_parameters_maximum_occurrences["updatePet:::body"]=0
 operation_parameters_maximum_occurrences["updatePetWithForm:::petId"]=0
 operation_parameters_maximum_occurrences["updatePetWithForm:::name"]=0
 operation_parameters_maximum_occurrences["updatePetWithForm:::status"]=0
@ -241,30 +243,31 @@ operation_parameters_maximum_occurrences["uploadFileWithRequiredFile:::requiredF
 operation_parameters_maximum_occurrences["uploadFileWithRequiredFile:::additionalMetadata"]=0
 operation_parameters_maximum_occurrences["deleteOrder:::order_id"]=0
 operation_parameters_maximum_occurrences["getOrderById:::order_id"]=0
-operation_parameters_maximum_occurrences["placeOrder:::Order"]=0
-operation_parameters_maximum_occurrences["createUser:::User"]=0
-operation_parameters_maximum_occurrences["createUsersWithArrayInput:::User"]=0
-operation_parameters_maximum_occurrences["createUsersWithListInput:::User"]=0
+operation_parameters_maximum_occurrences["placeOrder:::body"]=0
+operation_parameters_maximum_occurrences["createUser:::body"]=0
+operation_parameters_maximum_occurrences["createUsersWithArrayInput:::body"]=0
+operation_parameters_maximum_occurrences["createUsersWithListInput:::body"]=0
 operation_parameters_maximum_occurrences["deleteUser:::username"]=0
 operation_parameters_maximum_occurrences["getUserByName:::username"]=0
 operation_parameters_maximum_occurrences["loginUser:::username"]=0
 operation_parameters_maximum_occurrences["loginUser:::password"]=0
 operation_parameters_maximum_occurrences["updateUser:::username"]=0
-operation_parameters_maximum_occurrences["updateUser:::User"]=0
+operation_parameters_maximum_occurrences["updateUser:::body"]=0

 ##
 # The type of collection for specifying multiple values for parameter:
 # - multi, csv, ssv, tsv
 declare -A operation_parameters_collection_type
-operation_parameters_collection_type["call123TestSpecialTags:::Client"]=""
+operation_parameters_collection_type["call123TestSpecialTags:::body"]=""
+operation_parameters_collection_type["createXmlItem:::XmlItem"]=""
 operation_parameters_collection_type["fakeOuterBooleanSerialize:::body"]=""
-operation_parameters_collection_type["fakeOuterCompositeSerialize:::OuterComposite"]=""
+operation_parameters_collection_type["fakeOuterCompositeSerialize:::body"]=""
 operation_parameters_collection_type["fakeOuterNumberSerialize:::body"]=""
 operation_parameters_collection_type["fakeOuterStringSerialize:::body"]=""
-operation_parameters_collection_type["testBodyWithFileSchema:::FileSchemaTestClass"]=""
+operation_parameters_collection_type["testBodyWithFileSchema:::body"]=""
 operation_parameters_collection_type["testBodyWithQueryParams:::query"]=""
-operation_parameters_collection_type["testBodyWithQueryParams:::User"]=""
-operation_parameters_collection_type["testClientModel:::Client"]=""
+operation_parameters_collection_type["testBodyWithQueryParams:::body"]=""
+operation_parameters_collection_type["testClientModel:::body"]=""
 operation_parameters_collection_type["testEndpointParameters:::number"]=""
 operation_parameters_collection_type["testEndpointParameters:::double"]=""
 operation_parameters_collection_type["testEndpointParameters:::pattern_without_delimiter"]=""
@ -281,7 +284,7 @@ operation_parameters_collection_type["testEndpointParameters:::password"]=""
 operation_parameters_collection_type["testEndpointParameters:::callback"]=""
 operation_parameters_collection_type["testEnumParameters:::enum_header_string_array"]="csv"
 operation_parameters_collection_type["testEnumParameters:::enum_header_string"]=""
-operation_parameters_collection_type["testEnumParameters:::enum_query_string_array"]="multi"
+operation_parameters_collection_type["testEnumParameters:::enum_query_string_array"]="csv"
 operation_parameters_collection_type["testEnumParameters:::enum_query_string"]=""
 operation_parameters_collection_type["testEnumParameters:::enum_query_integer"]=""
 operation_parameters_collection_type["testEnumParameters:::enum_query_double"]=""
@ -293,22 +296,22 @@ operation_parameters_collection_type["testGroupParameters:::required_int64_group
 operation_parameters_collection_type["testGroupParameters:::string_group"]=""
 operation_parameters_collection_type["testGroupParameters:::boolean_group"]=""
 operation_parameters_collection_type["testGroupParameters:::int64_group"]=""
-operation_parameters_collection_type["testInlineAdditionalProperties:::request_body"]=
+operation_parameters_collection_type["testInlineAdditionalProperties:::param"]=
 operation_parameters_collection_type["testJsonFormData:::param"]=""
 operation_parameters_collection_type["testJsonFormData:::param2"]=""
-operation_parameters_collection_type["testQueryParameterCollectionFormat:::pipe"]="multi"
+operation_parameters_collection_type["testQueryParameterCollectionFormat:::pipe"]="csv"
 operation_parameters_collection_type["testQueryParameterCollectionFormat:::ioutil"]="csv"
-operation_parameters_collection_type["testQueryParameterCollectionFormat:::http"]=
+operation_parameters_collection_type["testQueryParameterCollectionFormat:::http"]="ssv"
 operation_parameters_collection_type["testQueryParameterCollectionFormat:::url"]="csv"
 operation_parameters_collection_type["testQueryParameterCollectionFormat:::context"]="multi"
-operation_parameters_collection_type["testClassname:::Client"]=""
-operation_parameters_collection_type["addPet:::Pet"]=""
+operation_parameters_collection_type["testClassname:::body"]=""
+operation_parameters_collection_type["addPet:::body"]=""
 operation_parameters_collection_type["deletePet:::petId"]=""
 operation_parameters_collection_type["deletePet:::api_key"]=""
 operation_parameters_collection_type["findPetsByStatus:::status"]="csv"
 operation_parameters_collection_type["findPetsByTags:::tags"]="csv"
 operation_parameters_collection_type["getPetById:::petId"]=""
-operation_parameters_collection_type["updatePet:::Pet"]=""
+operation_parameters_collection_type["updatePet:::body"]=""
 operation_parameters_collection_type["updatePetWithForm:::petId"]=""
 operation_parameters_collection_type["updatePetWithForm:::name"]=""
 operation_parameters_collection_type["updatePetWithForm:::status"]=""
@ -320,16 +323,16 @@ operation_parameters_collection_type["uploadFileWithRequiredFile:::requiredFile"
 operation_parameters_collection_type["uploadFileWithRequiredFile:::additionalMetadata"]=""
 operation_parameters_collection_type["deleteOrder:::order_id"]=""
 operation_parameters_collection_type["getOrderById:::order_id"]=""
-operation_parameters_collection_type["placeOrder:::Order"]=""
-operation_parameters_collection_type["createUser:::User"]=""
-operation_parameters_collection_type["createUsersWithArrayInput:::User"]=
-operation_parameters_collection_type["createUsersWithListInput:::User"]=
+operation_parameters_collection_type["placeOrder:::body"]=""
+operation_parameters_collection_type["createUser:::body"]=""
+operation_parameters_collection_type["createUsersWithArrayInput:::body"]=
+operation_parameters_collection_type["createUsersWithListInput:::body"]=
 operation_parameters_collection_type["deleteUser:::username"]=""
 operation_parameters_collection_type["getUserByName:::username"]=""
 operation_parameters_collection_type["loginUser:::username"]=""
 operation_parameters_collection_type["loginUser:::password"]=""
 operation_parameters_collection_type["updateUser:::username"]=""
-operation_parameters_collection_type["updateUser:::User"]=""
+operation_parameters_collection_type["updateUser:::body"]=""


 ##
@ -425,7 +428,7 @@ url_escape() {
       -e 's/(/%28/g' \
       -e 's/)/%29/g' \
       -e 's/:/%3A/g' \
-       -e 's/\t/%09/g' \
+       -e 's/\\t/%09/g' \
       -e 's/?/%3F/g' <<<"$raw_url");

    echo "$value"
@ -722,8 +725,6 @@ EOF
    echo -e "              or export ${RED}PETSTORE_API_KEY='<api-key>'${OFF}"
    echo -e "  - ${BLUE}Basic AUTH${OFF} - add '-u <username>:<password>' before ${YELLOW}<operation>${OFF}"
    echo -e "                 or export ${RED}PETSTORE_BASIC_AUTH='<username>:<password>'${OFF}"
-    echo -e "  - ${BLUE}Basic AUTH${OFF} - add '-u <username>:<password>' before ${YELLOW}<operation>${OFF}"
-    echo -e "                 or export ${RED}PETSTORE_BASIC_AUTH='<username>:<password>'${OFF}"
    echo -e "  - ${MAGENTA}OAuth2 (flow: implicit)${OFF}"
    echo -e "      Authorization URL: "
    echo -e "        * http://petstore.swagger.io/api/oauth/dialog"
@ -737,17 +738,11 @@ EOF
 read -r -d '' ops <<EOF
  ${CYAN}call123TestSpecialTags${OFF};To test special tags
 EOF
-echo "  $ops" | column -t -s ';'
-    echo ""
-    echo -e "${BOLD}${WHITE}[default]${OFF}"
-read -r -d '' ops <<EOF
-  ${CYAN}fooGet${OFF};
-EOF
 echo "  $ops" | column -t -s ';'
    echo ""
    echo -e "${BOLD}${WHITE}[fake]${OFF}"
 read -r -d '' ops <<EOF
-  ${CYAN}fakeHealthGet${OFF};Health check endpoint
+  ${CYAN}createXmlItem${OFF};creates an XmlItem
  ${CYAN}fakeOuterBooleanSerialize${OFF};
  ${CYAN}fakeOuterCompositeSerialize${OFF};
  ${CYAN}fakeOuterNumberSerialize${OFF};
@ -760,7 +755,7 @@ read -r -d '' ops <<EOF
 偽のエンドポイント
 가짜 엔드 포인트 (AUTH)
  ${CYAN}testEnumParameters${OFF};To test enum parameters
-  ${CYAN}testGroupParameters${OFF};Fake endpoint to test group parameters (optional) (AUTH)
+  ${CYAN}testGroupParameters${OFF};Fake endpoint to test group parameters (optional)
  ${CYAN}testInlineAdditionalProperties${OFF};test inline additionalProperties
  ${CYAN}testJsonFormData${OFF};test json serialization of form data
  ${CYAN}testQueryParameterCollectionFormat${OFF};
@ -880,31 +875,22 @@ print_call123TestSpecialTags_help() {
 }
 ##############################################################################
 #
-# Print help for fooGet operation
+# Print help for createXmlItem operation
 #
 ##############################################################################
-print_fooGet_help() {
+print_createXmlItem_help() {
    echo ""
-    echo -e "${BOLD}${WHITE}fooGet - ${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "${BOLD}${WHITE}createXmlItem - creates an XmlItem${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
-    echo ""
-    echo -e "${BOLD}${WHITE}Responses${OFF}"
-    code=0
-    echo -e "${result_color_table[${code:0:1}]}  0;response${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
-}
-##############################################################################
-#
-# Print help for fakeHealthGet operation
-#
-##############################################################################
-print_fakeHealthGet_help() {
-    echo ""
-    echo -e "${BOLD}${WHITE}fakeHealthGet - Health check endpoint${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "this route creates an XmlItem" | paste -sd' ' | fold -sw 80
+    echo -e ""
+    echo -e "${BOLD}${WHITE}Parameters${OFF}"
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/xml,application/xml; charset=utf-8,application/xml; charset=utf-16,text/xml,text/xml; charset=utf-8,text/xml; charset=utf-16]${OFF} ${RED}(required)${OFF}${OFF} - XmlItem Body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
    code=200
-    echo -e "${result_color_table[${code:0:1}]}  200;The instance started successfully${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
+    echo -e "${result_color_table[${code:0:1}]}  200;successful operation${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
 }
 ##############################################################################
 #
@ -918,7 +904,7 @@ print_fakeOuterBooleanSerialize_help() {
    echo -e "Test serialization of outer boolean types" | paste -sd' ' | fold -sw 80
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF}${OFF} - Input boolean as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF}${OFF} - Input boolean as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -937,7 +923,7 @@ print_fakeOuterCompositeSerialize_help() {
    echo -e "Test serialization of object with outer number type" | paste -sd' ' | fold -sw 80
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF}${OFF} - Input composite as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF}${OFF} - Input composite as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -956,7 +942,7 @@ print_fakeOuterNumberSerialize_help() {
    echo -e "Test serialization of outer number types" | paste -sd' ' | fold -sw 80
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF}${OFF} - Input number as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF}${OFF} - Input number as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -975,7 +961,7 @@ print_fakeOuterStringSerialize_help() {
    echo -e "Test serialization of outer string types" | paste -sd' ' | fold -sw 80
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF}${OFF} - Input string as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF}${OFF} - Input string as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -1078,7 +1064,7 @@ print_testEnumParameters_help() {
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
    echo -e "  * ${GREEN}enum_header_string_array${OFF} ${BLUE}[array[string]]${OFF} ${CYAN}(default: null)${OFF} - Header parameter enum test (string array) ${YELLOW}Specify as: enum_header_string_array:value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e "  * ${GREEN}enum_header_string${OFF} ${BLUE}[string]${OFF} ${CYAN}(default: -efg)${OFF} - Header parameter enum test (string) ${YELLOW}Specify as: enum_header_string:value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
-    echo -e "  * ${GREEN}enum_query_string_array${OFF} ${BLUE}[array[string]]${OFF} ${CYAN}(default: null)${OFF} - Query parameter enum test (string array)${YELLOW} Specify as: enum_query_string_array=value1 enum_query_string_array=value2 enum_query_string_array=...${OFF}" \
+    echo -e "  * ${GREEN}enum_query_string_array${OFF} ${BLUE}[array[string]]${OFF} ${CYAN}(default: null)${OFF} - Query parameter enum test (string array)${YELLOW} Specify as: enum_query_string_array="value1,value2,..."${OFF}" \
        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e "  * ${GREEN}enum_query_string${OFF} ${BLUE}[string]${OFF} ${CYAN}(default: -efg)${OFF} - Query parameter enum test (string)${YELLOW} Specify as: enum_query_string=value${OFF}" \
        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
@ -1100,7 +1086,7 @@ print_testEnumParameters_help() {
 ##############################################################################
 print_testGroupParameters_help() {
    echo ""
-    echo -e "${BOLD}${WHITE}testGroupParameters - Fake endpoint to test group parameters (optional)${OFF}${BLUE}(AUTH - BASIC)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "${BOLD}${WHITE}testGroupParameters - Fake endpoint to test group parameters (optional)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo -e "Fake endpoint to test group parameters (optional)" | paste -sd' ' | fold -sw 80
    echo -e ""
@ -1164,11 +1150,11 @@ print_testQueryParameterCollectionFormat_help() {
    echo -e "To test the collection format in query parameters" | paste -sd' ' | fold -sw 80
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}pipe${OFF} ${BLUE}[array[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ${YELLOW} Specify as: pipe=value1 pipe=value2 pipe=...${OFF}" \
+    echo -e "  * ${GREEN}pipe${OFF} ${BLUE}[array[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ${YELLOW} Specify as: pipe="value1,value2,..."${OFF}" \
        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e "  * ${GREEN}ioutil${OFF} ${BLUE}[array[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ${YELLOW} Specify as: ioutil="value1,value2,..."${OFF}" \
        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
-    echo -e "  * ${GREEN}http${OFF} ${BLUE}[array[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ${YELLOW} Specify as: ${OFF}" \
+    echo -e "  * ${GREEN}http${OFF} ${BLUE}[array[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ${YELLOW} Specify as: http="value1 value2 ..."${OFF}" \
        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e "  * ${GREEN}url${OFF} ${BLUE}[array[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - ${YELLOW} Specify as: url="value1,value2,..."${OFF}" \
        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
@ -1212,6 +1198,8 @@ print_addPet_help() {
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
+    code=200
+    echo -e "${result_color_table[${code:0:1}]}  200;successful operation${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
    code=405
    echo -e "${result_color_table[${code:0:1}]}  405;Invalid input${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
 }
@ -1229,6 +1217,8 @@ print_deletePet_help() {
    echo -e "  * ${GREEN}api_key${OFF} ${BLUE}[string]${OFF} ${CYAN}(default: null)${OFF} -  ${YELLOW}Specify as: api_key:value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
+    code=200
+    echo -e "${result_color_table[${code:0:1}]}  200;successful operation${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
    code=400
    echo -e "${result_color_table[${code:0:1}]}  400;Invalid pet value${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
 }
@ -1265,7 +1255,7 @@ print_findPetsByTags_help() {
    echo -e "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing." | paste -sd' ' | fold -sw 80
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}tags${OFF} ${BLUE}[array[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - Tags to filter by${YELLOW} Specify as: tags="value1,value2,..."${OFF}" \
+    echo -e "  * ${GREEN}tags${OFF} ${BLUE}[Set[string]]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - Tags to filter by${YELLOW} Specify as: tags="value1,value2,..."${OFF}" \
        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -1310,6 +1300,8 @@ print_updatePet_help() {
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
+    code=200
+    echo -e "${result_color_table[${code:0:1}]}  200;successful operation${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
    code=400
    echo -e "${result_color_table[${code:0:1}]}  400;Invalid ID supplied${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
    code=404
@ -1433,7 +1425,7 @@ print_placeOrder_help() {
    echo -e "${BOLD}${WHITE}placeOrder - Place an order for a pet${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF} ${RED}(required)${OFF}${OFF} - order placed for purchasing the pet" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - order placed for purchasing the pet" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -1454,7 +1446,7 @@ print_createUser_help() {
    echo -e "This can only be done by the logged in user." | paste -sd' ' | fold -sw 80
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF} ${RED}(required)${OFF}${OFF} - Created user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - Created user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -1471,7 +1463,7 @@ print_createUsersWithArrayInput_help() {
    echo -e "${BOLD}${WHITE}createUsersWithArrayInput - Creates list of users with given input array${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF} ${RED}(required)${OFF}${OFF} - List of user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - List of user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -1488,7 +1480,7 @@ print_createUsersWithListInput_help() {
    echo -e "${BOLD}${WHITE}createUsersWithListInput - Creates list of users with given input array${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF} ${RED}(required)${OFF}${OFF} - List of user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - List of user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -1586,7 +1578,7 @@ print_updateUser_help() {
    echo -e ""
    echo -e "${BOLD}${WHITE}Parameters${OFF}"
    echo -e "  * ${GREEN}username${OFF} ${BLUE}[string]${OFF} ${RED}(required)${OFF} ${CYAN}(default: null)${OFF} - name that need to be deleted ${YELLOW}Specify as: username=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF} ${RED}(required)${OFF}${OFF} - Updated user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - Updated user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
    echo -e ""
    echo ""
    echo -e "${BOLD}${WHITE}Responses${OFF}"
@ -1677,10 +1669,10 @@ call_call123TestSpecialTags() {

 ##############################################################################
 #
-# Call fooGet operation
+# Call createXmlItem operation
 #
 ##############################################################################
-call_fooGet() {
+call_createXmlItem() {
    # ignore error about 'path_parameter_names' being unused; passed by reference
    # shellcheck disable=SC2034
    local path_parameter_names=()
@ -1689,11 +1681,11 @@ call_fooGet() {
    local query_parameter_names=()
    local path

-    if ! path=$(build_request_path "/v2/foo" path_parameter_names query_parameter_names); then
+    if ! path=$(build_request_path "/v2/fake/create_xml_item" path_parameter_names query_parameter_names); then
        ERROR_MSG=$path
        exit 1
    fi
-    local method="GET"
+    local method="POST"
    local headers_curl
    headers_curl=$(header_arguments_to_curl)
    if [[ -n $header_accept ]]; then
@ -1704,46 +1696,54 @@ call_fooGet() {
    if [[ -n $basic_auth_credential ]]; then
        basic_auth_option="-u ${basic_auth_credential}"
    fi
-    if [[ "$print_curl" = true ]]; then
-        echo "curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\""
-    else
-        eval "curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\""
-    fi
-}
+    local body_json_curl=""

-##############################################################################
    #
-# Call fakeHealthGet operation
+    # Check if the user provided 'Content-type' headers in the
+    # command line. If not try to set them based on the OpenAPI specification
+    # if values produces and consumes are defined unambigously
    #
-##############################################################################
-call_fakeHealthGet() {
-    # ignore error about 'path_parameter_names' being unused; passed by reference
-    # shellcheck disable=SC2034
-    local path_parameter_names=()
-    # ignore error about 'query_parameter_names' being unused; passed by reference
-    # shellcheck disable=SC2034
-    local query_parameter_names=()
-    local path

-    if ! path=$(build_request_path "/v2/fake/health" path_parameter_names query_parameter_names); then
-        ERROR_MSG=$path
+
+    if [[ -z $header_content_type && "$force" = false ]]; then
+        :
+        echo "ERROR: Request's content-type not specified!!!"
+        echo "This operation expects content-type in one of the following formats:"
+        echo -e "\\t- application/xml"
+        echo -e "\\t- application/xml; charset=utf-8"
+        echo -e "\\t- application/xml; charset=utf-16"
+        echo -e "\\t- text/xml"
+        echo -e "\\t- text/xml; charset=utf-8"
+        echo -e "\\t- text/xml; charset=utf-16"
+        echo ""
+        echo "Use '--content-type' to set proper content type"
        exit 1
-    fi
-    local method="GET"
-    local headers_curl
-    headers_curl=$(header_arguments_to_curl)
-    if [[ -n $header_accept ]]; then
-        headers_curl="${headers_curl} -H 'Accept: ${header_accept}'"
+    else
+        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi

-    local basic_auth_option=""
-    if [[ -n $basic_auth_credential ]]; then
-        basic_auth_option="-u ${basic_auth_credential}"
-    fi
+
+    #
+    # If we have received some body content over pipe, pass it from the
+    # temporary file to cURL
+    #
+    if [[ -n $body_content_temp_file ]]; then
        if [[ "$print_curl" = true ]]; then
-        echo "curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\""
+            echo "cat ${body_content_temp_file} | curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\" -d @-"
        else
-        eval "curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\""
+            eval "cat ${body_content_temp_file} | curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\" -d @-"
+        fi
+        rm "${body_content_temp_file}"
+    #
+    # If not, try to build the content body from arguments KEY==VALUE and KEY:=VALUE
+    #
+    else
+        body_json_curl=$(body_parameters_to_json)
+        if [[ "$print_curl" = true ]]; then
+            echo "curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} ${body_json_curl} \"${host}${path}\""
+        else
+            eval "curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} ${body_json_curl} \"${host}${path}\""
+        fi
    fi
 }

@ -1783,19 +1783,10 @@ call_fakeOuterBooleanSerialize() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -1861,19 +1852,10 @@ call_fakeOuterCompositeSerialize() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -1939,19 +1921,10 @@ call_fakeOuterNumberSerialize() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -2017,19 +1990,10 @@ call_fakeOuterStringSerialize() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -3177,19 +3141,10 @@ call_placeOrder() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -3255,19 +3210,10 @@ call_createUser() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -3333,19 +3279,10 @@ call_createUsersWithArrayInput() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -3411,19 +3348,10 @@ call_createUsersWithListInput() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -3633,19 +3561,10 @@ call_updateUser() {
    # command line. If not try to set them based on the OpenAPI specification
    # if values produces and consumes are defined unambigously
    #
-    if [[ -z $header_content_type ]]; then
-        header_content_type="application/json"
-    fi


    if [[ -z $header_content_type && "$force" = false ]]; then
        :
-        echo "ERROR: Request's content-type not specified!!!"
-        echo "This operation expects content-type in one of the following formats:"
-        echo -e "\\t- application/json"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
    else
        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
    fi
@ -3775,11 +3694,8 @@ case $key in
    call123TestSpecialTags)
    operation="call123TestSpecialTags"
    ;;
-    fooGet)
-    operation="fooGet"
-    ;;
-    fakeHealthGet)
-    operation="fakeHealthGet"
+    createXmlItem)
+    operation="createXmlItem"
    ;;
    fakeOuterBooleanSerialize)
    operation="fakeOuterBooleanSerialize"
@ -3973,11 +3889,8 @@ case $operation in
    call123TestSpecialTags)
    call_call123TestSpecialTags
    ;;
-    fooGet)
-    call_fooGet
-    ;;
-    fakeHealthGet)
-    call_fakeHealthGet
+    createXmlItem)
+    call_createXmlItem
    ;;
    fakeOuterBooleanSerialize)
    call_fakeOuterBooleanSerialize
--- a/samples/client/petstore/bash/petstore-cli.bash-completion
+++ b/samples/client/petstore/bash/petstore-cli.bash-completion
@ -69,8 +69,7 @@ _petstore-cli()
    # It's modelled as an associative array for efficient key lookup
    declare -A operations
    operations["call123TestSpecialTags"]=1
-    operations["fooGet"]=1
-    operations["fakeHealthGet"]=1
+    operations["createXmlItem"]=1
    operations["fakeOuterBooleanSerialize"]=1
    operations["fakeOuterCompositeSerialize"]=1
    operations["fakeOuterNumberSerialize"]=1
@ -111,8 +110,7 @@ _petstore-cli()
    # Only include path, query and header parameters
    declare -A operation_parameters
    operation_parameters["call123TestSpecialTags"]=""
-    operation_parameters["fooGet"]=""
-    operation_parameters["fakeHealthGet"]=""
+    operation_parameters["createXmlItem"]=""
    operation_parameters["fakeOuterBooleanSerialize"]=""
    operation_parameters["fakeOuterCompositeSerialize"]=""
    operation_parameters["fakeOuterNumberSerialize"]=""