diff --git a/bin/openapi3/bash-petstore.sh b/bin/openapi3/bash-petstore.sh
new file mode 100755
index 00000000000..fe817569edd
--- /dev/null
+++ b/bin/openapi3/bash-petstore.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+args="$@ generate -t modules/openapi-generator/src/main/resources/bash -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -l bash -o samples/client/petstore/bash -c modules/openapi-generator/src/test/resources/2_0/bash-config.json --additional-properties hideGenerationTimestamp=true"
+
+java $JAVA_OPTS -jar $executable $args
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 03bd6106b28..e6397bc1b2b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -4193,7 +4193,9 @@ public class DefaultCodegen implements CodegenConfig {
                 imports.add(codegenParameter.baseType);
             } else {
                 CodegenProperty codegenProperty = fromProperty("property", schema);
-                if (codegenProperty != null) {
+                if (schema.getAdditionalProperties() != null) {// http body is map
+                    LOGGER.info("Map not supported in HTTP request body");
+                } else if (codegenProperty != null) {
                     LOGGER.warn("The folowing schema has undefined (null) baseType. " +
                             "It could be due to form parameter defined in OpenAPI v2 spec with incorrect consumes. " +
                             "A correct 'consumes' for form parameters should be " +
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
index 76bcfd395c7..ff60d660293 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
@@ -185,6 +185,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
         typeMapping.put("object", "map");
         typeMapping.put("integer", "integer");
         typeMapping.put("ByteArray", "string");
+        typeMapping.put("file", "binary");
         typeMapping.put("binary", "binary");
         typeMapping.put("UUID", "string");
 
@@ -698,9 +699,9 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
             if (example == null) {
                 example = "True";
             }
-        } else if ("file".equalsIgnoreCase(type)) {
+        } else if ("file".equalsIgnoreCase(type) || "binary".equalsIgnoreCase(type)) {
             if (example == null) {
-                example = "/path/to/file";
+                example = "BINARY_DATA_HERE";
             }
             example = "'" + escapeText(example) + "'";
         } else if ("date".equalsIgnoreCase(type)) {
@@ -716,6 +717,8 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
         } else if (!languageSpecificPrimitives.contains(type)) {
             // type is a model class, e.g. User
             example = type;
+        } else if ("array".equalsIgnoreCase(type) || "map".equalsIgnoreCase(type)) {
+            // skip map/array as it will be handled below
         } else {
             LOGGER.warn("Type " + type + " not handled properly in setParameterExampleValue");
         }
@@ -731,4 +734,10 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
         p.example = example;
     }
 
+    @Override
+    public String toModelFilename(String name) {
+        return initialCaps(name);
+    }
+
+
 }
diff --git a/samples/client/petstore/bash/.swagger-codegen/VERSION b/samples/client/petstore/bash/.swagger-codegen/VERSION
index f9f7450d135..096bf47efe3 100644
--- a/samples/client/petstore/bash/.swagger-codegen/VERSION
+++ b/samples/client/petstore/bash/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+3.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/bash/README.md b/samples/client/petstore/bash/README.md
index 51d9085d3e0..ca9e212b039 100644
--- a/samples/client/petstore/bash/README.md
+++ b/samples/client/petstore/bash/README.md
@@ -132,7 +132,6 @@ Class | Method | HTTP request | Description
 
 ## Documentation For Models
 
- - [$special[model.name]](docs/$special[model.name].md)
  - [200_response](docs/200_response.md)
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [Animal](docs/Animal.md)
@@ -141,10 +140,13 @@ Class | Method | HTTP request | Description
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [Body_4](docs/Body_4.md)
  - [Capitalization](docs/Capitalization.md)
+ - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
+ - [Dog](docs/Dog.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [Enum_Test](docs/Enum_Test.md)
@@ -165,8 +167,7 @@ Class | Method | HTTP request | Description
  - [Return](docs/Return.md)
  - [Tag](docs/Tag.md)
  - [User](docs/User.md)
- - [Cat](docs/Cat.md)
- - [Dog](docs/Dog.md)
+ - [_special_model.name_](docs/_special_model.name_.md)
 
 
 ## Documentation For Authorization
diff --git a/samples/client/petstore/bash/_petstore-cli b/samples/client/petstore/bash/_petstore-cli
index 397d2bdfabe..a4be886fecd 100644
--- a/samples/client/petstore/bash/_petstore-cli
+++ b/samples/client/petstore/bash/_petstore-cli
@@ -379,6 +379,7 @@ case $state in
                     "enum_query_string_array=:[QUERY] Query parameter enum test (string array)"
 "enum_query_string=:[QUERY] Query parameter enum test (string)"
 "enum_query_integer=:[QUERY] Query parameter enum test (double)"
+"enum_query_double=:[QUERY] Query parameter enum test (double)"
           "enum_header_string_array\::[HEADER] Header parameter enum test (string array)"
 "enum_header_string\::[HEADER] Header parameter enum test (string)"
 )
diff --git a/samples/client/petstore/bash/docs/AnotherFakeApi.md b/samples/client/petstore/bash/docs/AnotherFakeApi.md
index 039b7f381c6..b7eda018e08 100644
--- a/samples/client/petstore/bash/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/bash/docs/AnotherFakeApi.md
@@ -22,7 +22,7 @@ petstore-cli testSpecialTags
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md) | client model |
+ **client** | [**Client**](Client.md) | client model |
 
 ### Return type
 
@@ -34,7 +34,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not Applicable
  - **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)
diff --git a/samples/client/petstore/bash/docs/Enum_Test.md b/samples/client/petstore/bash/docs/Enum_Test.md
index b9de3aae862..1dcdb0d2888 100644
--- a/samples/client/petstore/bash/docs/Enum_Test.md
+++ b/samples/client/petstore/bash/docs/Enum_Test.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enum_string** | **string** |  | [optional] [default to null]
+**enum_string_required** | **string** |  | [default to null]
 **enum_integer** | **integer** |  | [optional] [default to null]
 **enum_number** | **float** |  | [optional] [default to null]
 **outerEnum** | [**OuterEnum**](OuterEnum.md) |  | [optional] [default to null]
diff --git a/samples/client/petstore/bash/docs/FakeApi.md b/samples/client/petstore/bash/docs/FakeApi.md
index 559a5bd1315..6b8da1e27ee 100644
--- a/samples/client/petstore/bash/docs/FakeApi.md
+++ b/samples/client/petstore/bash/docs/FakeApi.md
@@ -33,7 +33,7 @@ petstore-cli fakeOuterBooleanSerialize
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**OuterBoolean**](OuterBoolean.md) | Input boolean as post body | [optional]
+ **body** | **boolean** | Input boolean as post body | [optional]
 
 ### Return type
 
@@ -45,8 +45,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not Applicable
- - **Accept**: Not Applicable
+ - **Content-Type**: application/json
+ - **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)
 
@@ -65,7 +65,7 @@ petstore-cli fakeOuterCompositeSerialize
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**OuterComposite**](OuterComposite.md) | Input composite as post body | [optional]
+ **outerComposite** | [**OuterComposite**](OuterComposite.md) | Input composite as post body | [optional]
 
 ### Return type
 
@@ -77,8 +77,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not Applicable
- - **Accept**: Not Applicable
+ - **Content-Type**: application/json
+ - **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)
 
@@ -97,7 +97,7 @@ petstore-cli fakeOuterNumberSerialize
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**OuterNumber**](OuterNumber.md) | Input number as post body | [optional]
+ **body** | **integer** | Input number as post body | [optional]
 
 ### Return type
 
@@ -109,8 +109,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not Applicable
- - **Accept**: Not Applicable
+ - **Content-Type**: application/json
+ - **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)
 
@@ -129,7 +129,7 @@ petstore-cli fakeOuterStringSerialize
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**OuterString**](OuterString.md) | Input string as post body | [optional]
+ **body** | **string** | Input string as post body | [optional]
 
 ### Return type
 
@@ -141,8 +141,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not Applicable
- - **Accept**: Not Applicable
+ - **Content-Type**: application/json
+ - **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)
 
@@ -161,7 +161,7 @@ petstore-cli testClientModel
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md) | client model |
+ **client** | [**Client**](Client.md) | client model |
 
 ### Return type
 
@@ -173,7 +173,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not Applicable
  - **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)
@@ -224,8 +224,8 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/xml; charset=utf-8, application/json; charset=utf-8
- - **Accept**: application/xml; charset=utf-8, application/json; charset=utf-8
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **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)
 
@@ -237,21 +237,21 @@ To test enum parameters
 
 ### Example
 ```bash
-petstore-cli testEnumParameters enum_header_string_array:value enum_header_string:value  Specify as:   enum_query_string=value  enum_query_integer=value
+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
 ```
 
 ### Parameters
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **enumFormStringArray** | [**array[string]**](string.md) | Form parameter enum test (string array) | [optional]
- **enumFormString** | **string** | Form parameter enum test (string) | [optional] [default to -efg]
  **enumHeaderStringArray** | [**array[string]**](string.md) | Header parameter enum test (string array) | [optional]
- **enumHeaderString** | **string** | Header parameter enum test (string) | [optional] [default to -efg]
+ **enumHeaderString** | **string** | Header parameter enum test (string) | [optional]
  **enumQueryStringArray** | [**array[string]**](string.md) | Query parameter enum test (string array) | [optional]
- **enumQueryString** | **string** | Query parameter enum test (string) | [optional] [default to -efg]
+ **enumQueryString** | **string** | Query parameter enum test (string) | [optional]
  **enumQueryInteger** | **integer** | Query parameter enum test (double) | [optional]
  **enumQueryDouble** | **float** | Query parameter enum test (double) | [optional]
+ **enumFormStringArray** | [**array[string]**](array.md) | Form parameter enum test (string array) | [optional]
+ **enumFormString** | **string** | Form parameter enum test (string) | [optional]
 
 ### Return type
 
@@ -263,8 +263,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: */*
- - **Accept**: */*
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **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)
 
@@ -272,8 +272,6 @@ No authorization required
 
 test inline additionalProperties
 
-
-
 ### Example
 ```bash
 petstore-cli testInlineAdditionalProperties
@@ -283,7 +281,7 @@ petstore-cli testInlineAdditionalProperties
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **param** | **map** | request body |
+ **UNKNOWN_PARAM_NAME** | [****](.md) | request body |
 
 ### Return type
 
@@ -304,8 +302,6 @@ No authorization required
 
 test json serialization of form data
 
-
-
 ### Example
 ```bash
 petstore-cli testJsonFormData
@@ -315,8 +311,7 @@ petstore-cli testJsonFormData
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **param** | **string** | field1 |
- **param2** | **string** | field2 |
+ **body4** | [**Body_4**](Body_4.md) |  | [optional]
 
 ### Return type
 
diff --git a/samples/client/petstore/bash/docs/FakeClassnameTags123Api.md b/samples/client/petstore/bash/docs/FakeClassnameTags123Api.md
index 00a1f8b36be..3342194d5d2 100644
--- a/samples/client/petstore/bash/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/bash/docs/FakeClassnameTags123Api.md
@@ -11,6 +11,8 @@ Method | HTTP request | Description
 
 To test class name in snake case
 
+To test class name in snake case
+
 ### Example
 ```bash
 petstore-cli testClassname
@@ -20,7 +22,7 @@ petstore-cli testClassname
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Client**](Client.md) | client model |
+ **client** | [**Client**](Client.md) | client model |
 
 ### Return type
 
@@ -32,7 +34,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
+ - **Content-Type**: Not Applicable
  - **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)
diff --git a/samples/client/petstore/bash/docs/PetApi.md b/samples/client/petstore/bash/docs/PetApi.md
index 661ee03cbbf..d68bcc0f1bc 100644
--- a/samples/client/petstore/bash/docs/PetApi.md
+++ b/samples/client/petstore/bash/docs/PetApi.md
@@ -18,8 +18,6 @@ Method | HTTP request | Description
 
 Add a new pet to the store
 
-
-
 ### Example
 ```bash
 petstore-cli addPet
@@ -29,7 +27,7 @@ petstore-cli addPet
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md) | Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md) | Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -41,8 +39,8 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, 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)
 
@@ -50,8 +48,6 @@ Name | Type | Description  | Notes
 
 Deletes a pet
 
-
-
 ### Example
 ```bash
 petstore-cli deletePet petId=value api_key:value
@@ -75,7 +71,7 @@ Name | Type | Description  | Notes
 ### HTTP request headers
 
  - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **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)
 
@@ -179,8 +175,6 @@ Name | Type | Description  | Notes
 
 Update an existing pet
 
-
-
 ### Example
 ```bash
 petstore-cli updatePet
@@ -190,7 +184,7 @@ petstore-cli updatePet
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md) | Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md) | Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -202,8 +196,8 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, 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)
 
@@ -211,8 +205,6 @@ Name | Type | Description  | Notes
 
 Updates a pet in the store with form data
 
-
-
 ### Example
 ```bash
 petstore-cli updatePetWithForm petId=value
@@ -237,7 +229,7 @@ Name | Type | Description  | Notes
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
- - **Accept**: application/xml, application/json
+ - **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)
 
@@ -245,8 +237,6 @@ Name | Type | Description  | Notes
 
 uploads an image
 
-
-
 ### Example
 ```bash
 petstore-cli uploadFile petId=value
@@ -258,7 +248,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **integer** | ID of pet to update |
  **additionalMetadata** | **string** | Additional data to pass to server | [optional]
- **file** | **File** | file to upload | [optional]
+ **file** | **binary** | file to upload | [optional]
 
 ### Return type
 
diff --git a/samples/client/petstore/bash/docs/StoreApi.md b/samples/client/petstore/bash/docs/StoreApi.md
index 8e4bd83d3c4..6e260adbd15 100644
--- a/samples/client/petstore/bash/docs/StoreApi.md
+++ b/samples/client/petstore/bash/docs/StoreApi.md
@@ -38,7 +38,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **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)
 
@@ -107,8 +107,6 @@ No authorization required
 
 Place an order for a pet
 
-
-
 ### Example
 ```bash
 petstore-cli placeOrder
@@ -118,7 +116,7 @@ petstore-cli placeOrder
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Order**](Order.md) | order placed for purchasing the pet |
+ **order** | [**Order**](Order.md) | order placed for purchasing the pet |
 
 ### Return type
 
@@ -130,7 +128,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not Applicable
+ - **Content-Type**: application/json
  - **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)
diff --git a/samples/client/petstore/bash/docs/UserApi.md b/samples/client/petstore/bash/docs/UserApi.md
index e2d48888ed6..aca4f8746c3 100644
--- a/samples/client/petstore/bash/docs/UserApi.md
+++ b/samples/client/petstore/bash/docs/UserApi.md
@@ -29,7 +29,7 @@ petstore-cli createUser
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md) | Created user object |
+ **user** | [**User**](User.md) | Created user object |
 
 ### Return type
 
@@ -41,8 +41,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/json
+ - **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)
 
@@ -50,8 +50,6 @@ No authorization required
 
 Creates list of users with given input array
 
-
-
 ### Example
 ```bash
 petstore-cli createUsersWithArrayInput
@@ -61,7 +59,7 @@ petstore-cli createUsersWithArrayInput
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**array[User]**](User.md) | List of user object |
+ **user** | [**array[User]**](User.md) | List of user object |
 
 ### Return type
 
@@ -74,7 +72,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **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)
 
@@ -82,8 +80,6 @@ No authorization required
 
 Creates list of users with given input array
 
-
-
 ### Example
 ```bash
 petstore-cli createUsersWithListInput
@@ -93,7 +89,7 @@ petstore-cli createUsersWithListInput
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**array[User]**](User.md) | List of user object |
+ **user** | [**array[User]**](User.md) | List of user object |
 
 ### Return type
 
@@ -106,7 +102,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **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)
 
@@ -138,7 +134,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **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)
 
@@ -146,8 +142,6 @@ No authorization required
 
 Get user by user name
 
-
-
 ### Example
 ```bash
 petstore-cli getUserByName username=value
@@ -178,8 +172,6 @@ No authorization required
 
 Logs user into the system
 
-
-
 ### Example
 ```bash
 petstore-cli loginUser  username=value  password=value
@@ -211,8 +203,6 @@ No authorization required
 
 Logs out current logged in user session
 
-
-
 ### Example
 ```bash
 petstore-cli logoutUser
@@ -232,7 +222,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **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)
 
@@ -252,7 +242,7 @@ petstore-cli updateUser username=value
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **string** | name that need to be deleted |
- **body** | [**User**](User.md) | Updated user object |
+ **user** | [**User**](User.md) | Updated user object |
 
 ### Return type
 
@@ -264,8 +254,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not Applicable
- - **Accept**: application/xml, application/json
+ - **Content-Type**: application/json
+ - **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)
 
diff --git a/samples/client/petstore/bash/petstore-cli b/samples/client/petstore/bash/petstore-cli
index 50d159b0a1f..857cad06116 100755
--- a/samples/client/petstore/bash/petstore-cli
+++ b/samples/client/petstore/bash/petstore-cli
@@ -95,12 +95,12 @@ declare -a result_color_table=( "$WHITE" "$WHITE" "$GREEN" "$YELLOW" "$WHITE" "$
 # 0 - optional
 # 1 - required
 declare -A operation_parameters_minimum_occurrences
-operation_parameters_minimum_occurrences["testSpecialTags:::body"]=1
+operation_parameters_minimum_occurrences["testSpecialTags:::Client"]=1
 operation_parameters_minimum_occurrences["fakeOuterBooleanSerialize:::body"]=0
-operation_parameters_minimum_occurrences["fakeOuterCompositeSerialize:::body"]=0
+operation_parameters_minimum_occurrences["fakeOuterCompositeSerialize:::OuterComposite"]=0
 operation_parameters_minimum_occurrences["fakeOuterNumberSerialize:::body"]=0
 operation_parameters_minimum_occurrences["fakeOuterStringSerialize:::body"]=0
-operation_parameters_minimum_occurrences["testClientModel:::body"]=1
+operation_parameters_minimum_occurrences["testClientModel:::Client"]=1
 operation_parameters_minimum_occurrences["testEndpointParameters:::number"]=1
 operation_parameters_minimum_occurrences["testEndpointParameters:::double"]=1
 operation_parameters_minimum_occurrences["testEndpointParameters:::pattern_without_delimiter"]=1
@@ -115,25 +115,24 @@ operation_parameters_minimum_occurrences["testEndpointParameters:::date"]=0
 operation_parameters_minimum_occurrences["testEndpointParameters:::dateTime"]=0
 operation_parameters_minimum_occurrences["testEndpointParameters:::password"]=0
 operation_parameters_minimum_occurrences["testEndpointParameters:::callback"]=0
-operation_parameters_minimum_occurrences["testEnumParameters:::enum_form_string_array"]=0
-operation_parameters_minimum_occurrences["testEnumParameters:::enum_form_string"]=0
 operation_parameters_minimum_occurrences["testEnumParameters:::enum_header_string_array"]=0
 operation_parameters_minimum_occurrences["testEnumParameters:::enum_header_string"]=0
 operation_parameters_minimum_occurrences["testEnumParameters:::enum_query_string_array"]=0
 operation_parameters_minimum_occurrences["testEnumParameters:::enum_query_string"]=0
 operation_parameters_minimum_occurrences["testEnumParameters:::enum_query_integer"]=0
 operation_parameters_minimum_occurrences["testEnumParameters:::enum_query_double"]=0
-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["testClassname:::body"]=1
-operation_parameters_minimum_occurrences["addPet:::body"]=1
+operation_parameters_minimum_occurrences["testEnumParameters:::enum_form_string_array"]=0
+operation_parameters_minimum_occurrences["testEnumParameters:::enum_form_string"]=0
+operation_parameters_minimum_occurrences["testInlineAdditionalProperties:::UNKNOWN_BASE_NAME"]=1
+operation_parameters_minimum_occurrences["testJsonFormData:::Body_4"]=0
+operation_parameters_minimum_occurrences["testClassname:::Client"]=1
+operation_parameters_minimum_occurrences["addPet:::Pet"]=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:::body"]=1
+operation_parameters_minimum_occurrences["updatePet:::Pet"]=1
 operation_parameters_minimum_occurrences["updatePetWithForm:::petId"]=1
 operation_parameters_minimum_occurrences["updatePetWithForm:::name"]=0
 operation_parameters_minimum_occurrences["updatePetWithForm:::status"]=0
@@ -142,16 +141,16 @@ operation_parameters_minimum_occurrences["uploadFile:::additionalMetadata"]=0
 operation_parameters_minimum_occurrences["uploadFile:::file"]=0
 operation_parameters_minimum_occurrences["deleteOrder:::order_id"]=1
 operation_parameters_minimum_occurrences["getOrderById:::order_id"]=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["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["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:::body"]=1
+operation_parameters_minimum_occurrences["updateUser:::User"]=1
 
 ##
 # This array stores the maximum number of allowed occurrences for parameter
@@ -160,12 +159,12 @@ operation_parameters_minimum_occurrences["updateUser:::body"]=1
 # N - N values
 # 0 - unlimited
 declare -A operation_parameters_maximum_occurrences
-operation_parameters_maximum_occurrences["testSpecialTags:::body"]=0
+operation_parameters_maximum_occurrences["testSpecialTags:::Client"]=0
 operation_parameters_maximum_occurrences["fakeOuterBooleanSerialize:::body"]=0
-operation_parameters_maximum_occurrences["fakeOuterCompositeSerialize:::body"]=0
+operation_parameters_maximum_occurrences["fakeOuterCompositeSerialize:::OuterComposite"]=0
 operation_parameters_maximum_occurrences["fakeOuterNumberSerialize:::body"]=0
 operation_parameters_maximum_occurrences["fakeOuterStringSerialize:::body"]=0
-operation_parameters_maximum_occurrences["testClientModel:::body"]=0
+operation_parameters_maximum_occurrences["testClientModel:::Client"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::number"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::double"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::pattern_without_delimiter"]=0
@@ -180,25 +179,24 @@ operation_parameters_maximum_occurrences["testEndpointParameters:::date"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::dateTime"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::password"]=0
 operation_parameters_maximum_occurrences["testEndpointParameters:::callback"]=0
-operation_parameters_maximum_occurrences["testEnumParameters:::enum_form_string_array"]=0
-operation_parameters_maximum_occurrences["testEnumParameters:::enum_form_string"]=0
 operation_parameters_maximum_occurrences["testEnumParameters:::enum_header_string_array"]=0
 operation_parameters_maximum_occurrences["testEnumParameters:::enum_header_string"]=0
 operation_parameters_maximum_occurrences["testEnumParameters:::enum_query_string_array"]=0
 operation_parameters_maximum_occurrences["testEnumParameters:::enum_query_string"]=0
 operation_parameters_maximum_occurrences["testEnumParameters:::enum_query_integer"]=0
 operation_parameters_maximum_occurrences["testEnumParameters:::enum_query_double"]=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["testClassname:::body"]=0
-operation_parameters_maximum_occurrences["addPet:::body"]=0
+operation_parameters_maximum_occurrences["testEnumParameters:::enum_form_string_array"]=0
+operation_parameters_maximum_occurrences["testEnumParameters:::enum_form_string"]=0
+operation_parameters_maximum_occurrences["testInlineAdditionalProperties:::UNKNOWN_BASE_NAME"]=0
+operation_parameters_maximum_occurrences["testJsonFormData:::Body_4"]=0
+operation_parameters_maximum_occurrences["testClassname:::Client"]=0
+operation_parameters_maximum_occurrences["addPet:::Pet"]=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:::body"]=0
+operation_parameters_maximum_occurrences["updatePet:::Pet"]=0
 operation_parameters_maximum_occurrences["updatePetWithForm:::petId"]=0
 operation_parameters_maximum_occurrences["updatePetWithForm:::name"]=0
 operation_parameters_maximum_occurrences["updatePetWithForm:::status"]=0
@@ -207,27 +205,27 @@ operation_parameters_maximum_occurrences["uploadFile:::additionalMetadata"]=0
 operation_parameters_maximum_occurrences["uploadFile:::file"]=0
 operation_parameters_maximum_occurrences["deleteOrder:::order_id"]=0
 operation_parameters_maximum_occurrences["getOrderById:::order_id"]=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["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["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:::body"]=0
+operation_parameters_maximum_occurrences["updateUser:::User"]=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["testSpecialTags:::body"]=""
+operation_parameters_collection_type["testSpecialTags:::Client"]=""
 operation_parameters_collection_type["fakeOuterBooleanSerialize:::body"]=""
-operation_parameters_collection_type["fakeOuterCompositeSerialize:::body"]=""
+operation_parameters_collection_type["fakeOuterCompositeSerialize:::OuterComposite"]=""
 operation_parameters_collection_type["fakeOuterNumberSerialize:::body"]=""
 operation_parameters_collection_type["fakeOuterStringSerialize:::body"]=""
-operation_parameters_collection_type["testClientModel:::body"]=""
+operation_parameters_collection_type["testClientModel:::Client"]=""
 operation_parameters_collection_type["testEndpointParameters:::number"]=""
 operation_parameters_collection_type["testEndpointParameters:::double"]=""
 operation_parameters_collection_type["testEndpointParameters:::pattern_without_delimiter"]=""
@@ -242,25 +240,24 @@ operation_parameters_collection_type["testEndpointParameters:::date"]=""
 operation_parameters_collection_type["testEndpointParameters:::dateTime"]=""
 operation_parameters_collection_type["testEndpointParameters:::password"]=""
 operation_parameters_collection_type["testEndpointParameters:::callback"]=""
-operation_parameters_collection_type["testEnumParameters:::enum_form_string_array"]=
-operation_parameters_collection_type["testEnumParameters:::enum_form_string"]=""
-operation_parameters_collection_type["testEnumParameters:::enum_header_string_array"]=
+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"]=
+operation_parameters_collection_type["testEnumParameters:::enum_query_string_array"]="multi"
 operation_parameters_collection_type["testEnumParameters:::enum_query_string"]=""
 operation_parameters_collection_type["testEnumParameters:::enum_query_integer"]=""
 operation_parameters_collection_type["testEnumParameters:::enum_query_double"]=""
-operation_parameters_collection_type["testInlineAdditionalProperties:::param"]=""
-operation_parameters_collection_type["testJsonFormData:::param"]=""
-operation_parameters_collection_type["testJsonFormData:::param2"]=""
-operation_parameters_collection_type["testClassname:::body"]=""
-operation_parameters_collection_type["addPet:::body"]=""
+operation_parameters_collection_type["testEnumParameters:::enum_form_string_array"]=""
+operation_parameters_collection_type["testEnumParameters:::enum_form_string"]=""
+operation_parameters_collection_type["testInlineAdditionalProperties:::UNKNOWN_BASE_NAME"]=""
+operation_parameters_collection_type["testJsonFormData:::Body_4"]=""
+operation_parameters_collection_type["testClassname:::Client"]=""
+operation_parameters_collection_type["addPet:::Pet"]=""
 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:::body"]=""
+operation_parameters_collection_type["updatePet:::Pet"]=""
 operation_parameters_collection_type["updatePetWithForm:::petId"]=""
 operation_parameters_collection_type["updatePetWithForm:::name"]=""
 operation_parameters_collection_type["updatePetWithForm:::status"]=""
@@ -269,16 +266,16 @@ operation_parameters_collection_type["uploadFile:::additionalMetadata"]=""
 operation_parameters_collection_type["uploadFile:::file"]=""
 operation_parameters_collection_type["deleteOrder:::order_id"]=""
 operation_parameters_collection_type["getOrderById:::order_id"]=""
-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["placeOrder:::Order"]=""
+operation_parameters_collection_type["createUser:::User"]=""
+operation_parameters_collection_type["createUsersWithArrayInput:::User"]=
+operation_parameters_collection_type["createUsersWithListInput:::User"]=
 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:::body"]=""
+operation_parameters_collection_type["updateUser:::User"]=""
 
 
 ##
@@ -748,7 +745,7 @@ echo "  $ops" | column -t -s ';'
     echo -e "  -V,--version\\t\\t\\t\\tPrint API version"
     echo -e "  --about\\t\\t\\t\\tPrint the information about service"
     echo -e "  --host ${CYAN}<url>${OFF}\\t\\t\\t\\tSpecify the host URL "
-echo -e "              \\t\\t\\t\\t(e.g. 'https://petstore.swagger.io:80')"
+echo -e "              \\t\\t\\t\\t(e.g. 'https://petstore.swagger.io')"
 
     echo -e "  --force\\t\\t\\t\\tForce command invocation in spite of missing"
     echo -e "         \\t\\t\\t\\trequired parameters or wrong content type"
@@ -805,7 +802,7 @@ print_testSpecialTags_help() {
     echo -e "To test special tags" | 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} - client model" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - client model" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -824,7 +821,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}[]${OFF}${OFF} - Input boolean as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    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 ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -843,7 +840,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}[]${OFF}${OFF} - Input composite as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    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 ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -862,7 +859,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}[]${OFF}${OFF} - Input number as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    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 ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -881,7 +878,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}[]${OFF}${OFF} - Input string as post body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    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 ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -900,7 +897,7 @@ print_testClientModel_help() {
     echo -e "To test \"client\" model" | 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} - client model" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - client model" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -945,13 +942,15 @@ print_testEnumParameters_help() {
     echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}enum_header_string_array${OFF} ${BLUE}[array[string]]${OFF}${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}${OFF} - Query parameter enum test (string array)${YELLOW} Specify as: ${OFF}" \
+    echo -e "  * ${GREEN}enum_header_string${OFF} ${BLUE}[string]${OFF}${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}${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}" \
         | 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}" \
+    echo -e "  * ${GREEN}enum_query_string${OFF} ${BLUE}[string]${OFF}${OFF} - Query parameter enum test (string)${YELLOW} Specify as: enum_query_string=value${OFF}" \
         | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e "  * ${GREEN}enum_query_integer${OFF} ${BLUE}[integer]${OFF}${OFF} - Query parameter enum test (double)${YELLOW} Specify as: enum_query_integer=value${OFF}" \
         | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}enum_query_double${OFF} ${BLUE}[float]${OFF}${OFF} - Query parameter enum test (double)${YELLOW} Specify as: enum_query_double=value${OFF}" \
+        | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
     code=400
@@ -968,8 +967,6 @@ print_testInlineAdditionalProperties_help() {
     echo ""
     echo -e "${BOLD}${WHITE}testInlineAdditionalProperties - test inline additionalProperties${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | 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} - request body" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
@@ -987,9 +984,9 @@ print_testJsonFormData_help() {
     echo ""
     echo -e "${BOLD}${WHITE}testJsonFormData - test json serialization of form data${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json]${OFF}${OFF} - " | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
     code=200
@@ -1004,8 +1001,10 @@ print_testClassname_help() {
     echo ""
     echo -e "${BOLD}${WHITE}testClassname - To test class name in snake case${OFF}${BLUE}(AUTH - QUERY)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
+    echo -e "To test class name in snake case" | 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} - client model" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - client model" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -1021,10 +1020,8 @@ print_addPet_help() {
     echo ""
     echo -e "${BOLD}${WHITE}addPet - Add a new pet to the store${OFF}${BLUE}(AUTH - OAuth2)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json,application/xml]${OFF} ${RED}(required)${OFF}${OFF} - Pet object that needs to be added to the store" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - Pet object that needs to be added to the store" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -1040,8 +1037,6 @@ print_deletePet_help() {
     echo ""
     echo -e "${BOLD}${WHITE}deletePet - Deletes a pet${OFF}${BLUE}(AUTH - OAuth2)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}petId${OFF} ${BLUE}[integer]${OFF} ${RED}(required)${OFF}${OFF} - Pet id to delete ${YELLOW}Specify as: petId=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e "  * ${GREEN}api_key${OFF} ${BLUE}[string]${OFF}${OFF} -  ${YELLOW}Specify as: api_key:value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
@@ -1123,10 +1118,8 @@ print_updatePet_help() {
     echo ""
     echo -e "${BOLD}${WHITE}updatePet - Update an existing pet${OFF}${BLUE}(AUTH - OAuth2)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[application/json,application/xml]${OFF} ${RED}(required)${OFF}${OFF} - Pet object that needs to be added to the store" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[]${OFF} ${RED}(required)${OFF}${OFF} - Pet object that needs to be added to the store" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -1146,8 +1139,6 @@ print_updatePetWithForm_help() {
     echo ""
     echo -e "${BOLD}${WHITE}updatePetWithForm - Updates a pet in the store with form data${OFF}${BLUE}(AUTH - OAuth2)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}petId${OFF} ${BLUE}[integer]${OFF} ${RED}(required)${OFF}${OFF} - ID of pet that needs to be updated ${YELLOW}Specify as: petId=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo ""
@@ -1164,8 +1155,6 @@ print_uploadFile_help() {
     echo ""
     echo -e "${BOLD}${WHITE}uploadFile - uploads an image${OFF}${BLUE}(AUTH - OAuth2)${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}petId${OFF} ${BLUE}[integer]${OFF} ${RED}(required)${OFF}${OFF} - ID of pet to update ${YELLOW}Specify as: petId=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo ""
@@ -1240,10 +1229,8 @@ print_placeOrder_help() {
     echo ""
     echo -e "${BOLD}${WHITE}placeOrder - Place an order for a pet${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
-    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 "  * ${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 ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -1264,7 +1251,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}[]${OFF} ${RED}(required)${OFF}${OFF} - Created user object" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    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 ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -1280,8 +1267,6 @@ print_createUsersWithArrayInput_help() {
     echo ""
     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 "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     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 ""
@@ -1299,8 +1284,6 @@ print_createUsersWithListInput_help() {
     echo ""
     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 "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     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 ""
@@ -1338,8 +1321,6 @@ print_getUserByName_help() {
     echo ""
     echo -e "${BOLD}${WHITE}getUserByName - Get user by user name${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}username${OFF} ${BLUE}[string]${OFF} ${RED}(required)${OFF}${OFF} - The name that needs to be fetched. Use user1 for testing. ${YELLOW}Specify as: username=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo ""
@@ -1360,8 +1341,6 @@ print_loginUser_help() {
     echo ""
     echo -e "${BOLD}${WHITE}loginUser - Logs user into the system${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}username${OFF} ${BLUE}[string]${OFF} ${RED}(required)${OFF}${OFF} - The user name for login${YELLOW} Specify as: username=value${OFF}" \
         | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
@@ -1372,8 +1351,8 @@ print_loginUser_help() {
     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/^/       /'
         echo -e "       ${BOLD}${WHITE}Response headers${OFF}"
-        echo -e "       ${BLUE}X-Rate-Limit${OFF} - calls per hour allowed by the user" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/        /'
-        echo -e "       ${BLUE}X-Expires-After${OFF} - date in UTC when toekn expires" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/        /'
+        echo -e "       ${BLUE}X-Rate-Limit${OFF} - " | paste -sd' ' | fold -sw 80 | sed '2,$s/^/        /'
+        echo -e "       ${BLUE}X-Expires-After${OFF} - " | paste -sd' ' | fold -sw 80 | sed '2,$s/^/        /'
     code=400
     echo -e "${result_color_table[${code:0:1}]}  400;Invalid username/password supplied${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/       /'
 }
@@ -1386,8 +1365,6 @@ print_logoutUser_help() {
     echo ""
     echo -e "${BOLD}${WHITE}logoutUser - Logs out current logged in user session${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
-    echo -e "" | paste -sd' ' | fold -sw 80
-    echo -e ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
     code=0
@@ -1406,7 +1383,7 @@ print_updateUser_help() {
     echo -e ""
     echo -e "${BOLD}${WHITE}Parameters${OFF}"
     echo -e "  * ${GREEN}username${OFF} ${BLUE}[string]${OFF} ${RED}(required)${OFF}${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}[]${OFF} ${RED}(required)${OFF}${OFF} - Updated user object" | 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 ""
     echo ""
     echo -e "${BOLD}${WHITE}Responses${OFF}"
@@ -1453,19 +1430,10 @@ call_testSpecialTags() {
     # command line. If not try to set them based on the Swagger 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
@@ -1531,10 +1499,19 @@ call_fakeOuterBooleanSerialize() {
     # command line. If not try to set them based on the Swagger 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
@@ -1600,10 +1577,19 @@ call_fakeOuterCompositeSerialize() {
     # command line. If not try to set them based on the Swagger 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
@@ -1669,10 +1655,19 @@ call_fakeOuterNumberSerialize() {
     # command line. If not try to set them based on the Swagger 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
@@ -1738,10 +1733,19 @@ call_fakeOuterStringSerialize() {
     # command line. If not try to set them based on the Swagger 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
@@ -1807,19 +1811,10 @@ call_testClientModel() {
     # command line. If not try to set them based on the Swagger 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
@@ -1896,7 +1891,7 @@ call_testEnumParameters() {
     local path_parameter_names=()
     # ignore error about 'query_parameter_names' being unused; passed by reference
     # shellcheck disable=SC2034
-    local query_parameter_names=(enum_query_string_array enum_query_string enum_query_integer)
+    local query_parameter_names=(enum_query_string_array enum_query_string enum_query_integer enum_query_double)
     local path
 
     if ! path=$(build_request_path "/v2/fake" path_parameter_names query_parameter_names); then
@@ -2028,10 +2023,52 @@ call_testJsonFormData() {
     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}\""
+    local body_json_curl=""
+
+    #
+    # Check if the user provided 'Content-type' headers in the
+    # command line. If not try to set them based on the Swagger 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
-        eval "curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\""
+        headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
+    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 "cat ${body_content_temp_file} | curl ${basic_auth_option} ${curl_arguments} ${headers_curl} -X ${method} \"${host}${path}\" -d @-"
+        else
+            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
 }
 
@@ -2071,19 +2108,10 @@ call_testClassname() {
     # command line. If not try to set them based on the Swagger 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
@@ -2153,13 +2181,6 @@ call_addPet() {
 
     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 -e "\\t- application/xml"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
     else
         headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
     fi
@@ -2373,13 +2394,6 @@ call_updatePet() {
 
     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 -e "\\t- application/xml"
-        echo ""
-        echo "Use '--content-type' to set proper content type"
-        exit 1
     else
         headers_curl="${headers_curl} -H 'Content-type: ${header_content_type}'"
     fi
@@ -2625,10 +2639,19 @@ call_placeOrder() {
     # command line. If not try to set them based on the Swagger 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
@@ -2694,10 +2717,19 @@ call_createUser() {
     # command line. If not try to set them based on the Swagger 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
@@ -3045,10 +3077,19 @@ call_updateUser() {
     # command line. If not try to set them based on the Swagger 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
diff --git a/samples/client/petstore/bash/petstore-cli.bash-completion b/samples/client/petstore/bash/petstore-cli.bash-completion
index 712d439bfbd..2e4be7c5746 100644
--- a/samples/client/petstore/bash/petstore-cli.bash-completion
+++ b/samples/client/petstore/bash/petstore-cli.bash-completion
@@ -110,7 +110,7 @@ _petstore-cli()
     operation_parameters["fakeOuterStringSerialize"]=""
     operation_parameters["testClientModel"]=""
     operation_parameters["testEndpointParameters"]=""
-    operation_parameters["testEnumParameters"]="enum_query_string_array= enum_query_string= enum_query_integer= enum_header_string_array: enum_header_string: "
+    operation_parameters["testEnumParameters"]="enum_query_string_array= enum_query_string= enum_query_integer= enum_query_double= enum_header_string_array: enum_header_string: "
     operation_parameters["testInlineAdditionalProperties"]=""
     operation_parameters["testJsonFormData"]=""
     operation_parameters["testClassname"]=""